From be0301e67768fb183df7e29f411a7e54dbf15c40 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 五月 2024 10:37:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/business/dto/SaveUnionChangeDTO.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/SaveUnionChangeDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/SaveUnionChangeDTO.java
index 36ee37f..0cd5caf 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/SaveUnionChangeDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/SaveUnionChangeDTO.java
@@ -22,11 +22,20 @@
@ApiModelProperty(value = "鍔犲噺淇�/鎹㈠巶鍗曟嵁涓婚敭 澶氫釜浠�,鍒嗗壊")
private List<Integer> applyIds;
- @ApiModelProperty(value = "鎵瑰崟鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date applyDate;
+// @ApiModelProperty(value = "鎵瑰崟鏃ユ湡")
+// @JsonFormat(pattern = "yyyy-MM-dd")
+// private Date applyDate;
@ApiModelProperty(value = "涓氬姟绫诲瀷锛�0=鍔犲噺淇�;1=鎹㈠巶")
private Integer businessType;
+
+ @ApiModelProperty(value = "鍔犱繚鐢熸晥鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date addValidDate;
+
+ @ApiModelProperty(value = "鍑忎繚鐢熸晥鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date delValidDate;
+
}
--
Gitblit v1.9.3