From 9dc0d681e17d735ff42195a29e6905f4ee9f01da Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 六月 2025 09:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 caeac95..32769c6 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
@@ -77,6 +77,10 @@
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
private Date validTime;
+ @ApiModelProperty(value = "瀹為檯鍑忎繚鐢熸晥璧锋湡")
+ @ExcelColumn(name="瀹為檯鍑忎繚鐢熸晥璧锋湡")
+ private Date delValidTime;
+
@ApiModelProperty(value = "鎵瑰崟鍙�")
@ExcelColumn(name="鎵瑰崟鍙�")
private String validCode;
@@ -111,10 +115,17 @@
@TableField(exist = false)
private String applyCode;
+ @ApiModelProperty(value = "鍟嗘埛鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String companyName;
@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)
@@ -160,8 +171,8 @@
@TableField(exist = false)
private Multifile applyFile;
- @ApiModelProperty(value = "鎵瑰崟闄勪欢")
- @TableField(exist = false)
- private Multifile pidanFile;
+ @ApiModelProperty(value = "鎵瑰崟闄勪欢鍒楄〃")
+ @TableField(exist = false)
+ private List<Multifile> pidanFileList;
}
--
Gitblit v1.9.3