From a0f65b9cc2efbbbcfb1b2a7974a44b54ba937d04 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 08 二月 2025 17:18:54 +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/YwPatrolTaskRecord.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java
index ef8a041..379c7ff 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java
@@ -75,15 +75,15 @@
@ApiModelProperty(value = "澶勭悊鏃堕棿")
@ExcelColumn(name="澶勭悊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dealDate;
@ApiModelProperty(value = "鏄惁宸℃ 0=寰呭紑濮嬶紱1=宸插贰妫�锛�", example = "1")
@ExcelColumn(name="鏄惁宸℃ 0=寰呭紑濮嬶紱1=宸插贰妫�")
private Integer status;
- @ApiModelProperty(value = "宸℃缁撴灉 0=姝ｅ父锛�1=寮傚父", example = "1")
- @ExcelColumn(name="宸℃缁撴灉 0=姝ｅ父锛�1=寮傚父")
+ @ApiModelProperty(value = "宸℃缁撴灉 0=姝ｅ父锛�1=寮傚父;2=璺宠繃锛�", example = "1")
+ @ExcelColumn(name="宸℃缁撴灉 0=姝ｅ父锛�1=寮傚父锛�2=璺宠繃锛�")
private Integer dealStatus;
@ApiModelProperty(value = "澶勭悊澶囨敞")
--
Gitblit v1.9.3