From 2d513a9f0e1ebb83e529973e9e79befdaea7d740 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 六月 2024 13:55:05 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java | 15 +++++++++++----
1 files changed, 11 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 6595c70..a831310 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,8 +75,11 @@
@ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date validTime;
+
+ @ApiModelProperty(value = "瀹為檯鍑忎繚鐢熸晥璧锋湡")
+ @ExcelColumn(name="瀹為檯鍑忎繚鐢熸晥璧锋湡")
+ private Date delValidTime;
@ApiModelProperty(value = "鎵瑰崟鍙�")
@ExcelColumn(name="鎵瑰崟鍙�")
@@ -160,5 +160,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