From deb4575b72443cf906946a9fb28a557c16556fb9 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期五, 01 十一月 2024 09:30:50 +0800 Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/yunyibao into 2.0.1 --- server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 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..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 @@ -77,6 +77,10 @@ @ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡") private Date validTime; + @ApiModelProperty(value = "瀹為檯鍑忎繚鐢熸晥璧锋湡") + @ExcelColumn(name="瀹為檯鍑忎繚鐢熸晥璧锋湡") + private Date delValidTime; + @ApiModelProperty(value = "鎵瑰崟鍙�") @ExcelColumn(name="鎵瑰崟鍙�") private String validCode; @@ -116,6 +120,10 @@ @TableField(exist = false) private Date endTime; + @ApiModelProperty(value = "鎵瑰噺鏄惁浠呮敮鎸佹浛鎹� 0鍚� 1鏄�", example = "1") + @TableField(exist = false) + private Integer delOnlyReplace; + @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡") @TableField(exist = false) private Date startTime; -- Gitblit v1.9.3