From 098386f316ecaa7122bc979809d8160db81304ed Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期四, 06 二月 2025 18:17:26 +0800 Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwOutinboundRecord.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwOutinboundRecord.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwOutinboundRecord.java index b201cb7..d8a3f12 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwOutinboundRecord.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwOutinboundRecord.java @@ -33,7 +33,7 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -99,6 +99,7 @@ @ApiModelProperty(value = "鍗曟嵁鏃ユ湡") @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd") private Date doneDate; @ApiModelProperty(value = "涓�绾у垎绫诲悕绉�") @@ -117,6 +118,10 @@ @TableField(exist = false) private String code; + @ApiModelProperty(value = "绫诲瀷 0閲囪喘鍏ュ簱 1棰嗙敤閫�鍥� 2璋冩暣鍏ュ簱 3鍏朵粬鍏ュ簱 4鐩樼泩鍏ュ簱 5棰嗙敤鍑哄簱 6浠撳簱鍑哄簱 7璋冩暣鍑哄簱 8閲囪喘鍑哄簱 9鍏朵粬鍑哄簱 10鐩樹簭鍑哄簱", example = "1") + @TableField(exist = false) + private Integer type; + @ApiModelProperty(value = "鍗曟嵁鏃ユ湡 寮�濮� yyyy-MM-dd", example = "1") @TableField(exist = false) -- Gitblit v1.9.3