From 977743d6833a970fb329bd9e5d409e9cb9e5115c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 六月 2024 16:16:02 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 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 d73a164..cb69e8c 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="鎵瑰崟鍙�")
@@ -97,6 +97,12 @@
@ExcelColumn(name="鍚堝苟淇濆崟涓婚敭")
private Integer unionApplyId;
+
+
+ @ApiModelProperty(value = "鍙樻洿璐圭敤")
+ @TableField(exist = false)
+ private BigDecimal fee;
+
@ApiModelProperty(value = "鍟嗘埛鍚嶇О")
@TableField(exist = false)
private String shopName;
@@ -113,6 +119,10 @@
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
@TableField(exist = false)
private Date endTime;
+
+ @ApiModelProperty(value = "鎵瑰噺鏄惁浠呮敮鎸佹浛鎹� 0鍚� 1鏄�", example = "1")
+ @TableField(exist = false)
+ private Integer delOnlyReplace;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
@TableField(exist = false)
@@ -149,4 +159,17 @@
@ApiModelProperty(value = "鎹㈠巶浜烘暟")
@TableField(exist = false)
private Integer changeNum;
+
+
+ @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