From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch

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

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java b/server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java
index 8b15110..caeac95 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java
@@ -35,7 +35,6 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -44,7 +43,6 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -69,7 +67,6 @@
 
     @ApiModelProperty(value = "鎵瑰崟鐢熸晥鏃堕棿")
     @ExcelColumn(name="鎵瑰崟鐢熸晥鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date applyStartTime;
 
     @ApiModelProperty(value = "鐘舵�� 0寰呯缃茬敵璇峰崟 1寰呬笂浼犳壒鍗� 2宸蹭笂浼犳壒鍗� 3閫�鍥�")
@@ -78,7 +75,6 @@
 
     @ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
     @ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date validTime;
 
     @ApiModelProperty(value = "鎵瑰崟鍙�")
@@ -96,6 +92,12 @@
     @ApiModelProperty(value = "鍚堝苟淇濆崟涓婚敭")
     @ExcelColumn(name="鍚堝苟淇濆崟涓婚敭")
     private Integer unionApplyId;
+
+
+
+    @ApiModelProperty(value = "鍙樻洿璐圭敤")
+    @TableField(exist = false)
+    private BigDecimal fee;
 
     @ApiModelProperty(value = "鍟嗘埛鍚嶇О")
     @TableField(exist = false)
@@ -154,5 +156,12 @@
     @ApiModelProperty(value = "鏃ュ織璁板綍")
     @TableField(exist = false)
     private List<ApplyLog> applyLogList;
+    @ApiModelProperty(value = "鐢宠鍗曢檮浠�")
+    @TableField(exist = false)
+    private Multifile applyFile;
+
+    @ApiModelProperty(value = "鎵瑰崟闄勪欢")
+    @TableField(exist = false)
+    private Multifile pidanFile;
 
 }

--
Gitblit v1.9.3