From e567a81f9dd15c15981c25576cc83df6331ea2b5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 20 五月 2025 11:19:55 +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/SettleClaimsExt.java | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsExt.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsExt.java
index 1a58b57..9ac1a92 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsExt.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsExt.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -74,7 +72,6 @@
@ApiModelProperty(value = "鍑洪櫓浜哄嚭鐢熸棩鏈�")
@ExcelColumn(name="鍑洪櫓浜哄嚭鐢熸棩鏈�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date memberBirthday;
@ApiModelProperty(value = "鍑洪櫓浜哄勾绾�", example = "1")
@@ -103,12 +100,10 @@
@ApiModelProperty(value = "淇濋櫓寮�濮嬫椂闂�")
@ExcelColumn(name="淇濋櫓寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date bxStartdate;
@ApiModelProperty(value = "淇濋櫓缁撴潫鏃堕棿")
@ExcelColumn(name="淇濋櫓缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date bxEnddate;
@ApiModelProperty(value = "鎶曚繚浜哄鍚�")
@@ -137,7 +132,6 @@
@ApiModelProperty(value = "娉ㄩ攢浜嬩欢")
@ExcelColumn(name="娉ㄩ攢浜嬩欢")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date logoffDate;
@ApiModelProperty(value = "娉ㄩ攢澶勭悊浜�")
@@ -174,7 +168,6 @@
@ApiModelProperty(value = "浜哄憳浼や骸-鍑洪櫌鏃堕棿")
@ExcelColumn(name="浜哄憳浼や骸-鍑洪櫌鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date rsCyDate;
@ApiModelProperty(value = "浜哄憳浼や骸-鍖荤枟鏈烘瀯")
@@ -251,7 +244,6 @@
@ApiModelProperty(value = "閴村畾淇℃伅-璇勫畾鏃ユ湡")
@ExcelColumn(name="閴村畾淇℃伅-璇勫畾鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date jdPdDate;
@ApiModelProperty(value = "閴村畾淇℃伅-浼ゆ畫绛夌骇 0-10", example = "1")
--
Gitblit v1.9.3