From 8b46c471e28fbf0b71efbe363facf0bf05d8f6f8 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 14 三月 2024 18:12:30 +0800
Subject: [PATCH] aaa

---
 server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
index 722efb5..f9a1963 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
@@ -89,15 +89,17 @@
     @ApiModelProperty(value = "鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� (寰呯缃�) 4閫�鍥炵敵璇� (宸茬绔�)  5骞冲彴鍚屾剰锛堝凡閫�鍥烇級 6宸插叧闂� ")
     @ExcelColumn(name="鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇� (寰呯缃�) 4閫�鍥炵敵璇� (宸茬绔�)  5骞冲彴鍚屾剰锛堝凡閫�鍥烇級 6宸插叧闂� ")
     private Integer status;
-
+    @ApiModelProperty(value = "鍚堝苟鍗曠紪鐮侊紙鍏宠仈union_change)", example = "1")
+    @ExcelColumn(name="鍚堝苟鍗曠紪鐮侊紙鍏宠仈union_change)")
+    private Integer unionChangeId;
     @ApiModelProperty(value = "鍦ㄧ嚎绛剧珷鍚堝悓鍙�")
     private String signApplyNo;
     @ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
     @ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
     //鍏ュ弬
-     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    //鍑哄弬
-    @JsonFormat(pattern="yyyy-MM-dd")
+//     @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    //鍑哄弬
+//    @JsonFormat(pattern="yyyy-MM-dd")
     private Date validTime;
 
     @ApiModelProperty(value = "鎵瑰崟鍙�")

--
Gitblit v1.9.3