From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsExt.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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..a7beb3c 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
@@ -8,6 +8,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.util.Date;
import java.math.BigDecimal;
@@ -32,7 +34,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +42,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -74,7 +74,8 @@
@ApiModelProperty(value = "鍑洪櫓浜哄嚭鐢熸棩鏈�")
@ExcelColumn(name="鍑洪櫓浜哄嚭鐢熸棩鏈�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern="yyyy-MM-dd")
private Date memberBirthday;
@ApiModelProperty(value = "鍑洪櫓浜哄勾绾�", example = "1")
@@ -103,12 +104,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 = "鎶曚繚浜哄鍚�")
@@ -135,9 +134,10 @@
@ExcelColumn(name="鏄惁宸叉敞閿� 0鏄� 1鍚�")
private Integer logoff;
- @ApiModelProperty(value = "娉ㄩ攢浜嬩欢")
- @ExcelColumn(name="娉ㄩ攢浜嬩欢")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "娉ㄩ攢鏃堕棿")
+ @ExcelColumn(name="娉ㄩ攢鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern="yyyy-MM-dd")
private Date logoffDate;
@ApiModelProperty(value = "娉ㄩ攢澶勭悊浜�")
@@ -174,7 +174,8 @@
@ApiModelProperty(value = "浜哄憳浼や骸-鍑洪櫌鏃堕棿")
@ExcelColumn(name="浜哄憳浼や骸-鍑洪櫌鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern="yyyy-MM-dd")
private Date rsCyDate;
@ApiModelProperty(value = "浜哄憳浼や骸-鍖荤枟鏈烘瀯")
@@ -251,7 +252,8 @@
@ApiModelProperty(value = "閴村畾淇℃伅-璇勫畾鏃ユ湡")
@ExcelColumn(name="閴村畾淇℃伅-璇勫畾鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern="yyyy-MM-dd")
private Date jdPdDate;
@ApiModelProperty(value = "閴村畾淇℃伅-浼ゆ畫绛夌骇 0-10", example = "1")
@@ -274,4 +276,7 @@
@ExcelColumn(name="璐ｄ换涓庤瘎娈嬫潯閴村畾淇℃伅-娆惧叧鑱斿叧绯� 0淇濆崟鍙� 1鍏宠仈璇勬畫鏉℃ 2鍔冲姩鑳藉姏閴村畾")
private Integer jdZrpctkRel;
+ @ApiModelProperty(value = "鎶ユ鏃堕棿")
+ private Date reportDate;
+
}
--
Gitblit v1.9.3