From 553831c82c2e8f8ff7b230c4d536cf99c47ece5b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 一月 2024 18:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
index 3046fa6..9d29828 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
@@ -12,12 +12,12 @@
import java.math.BigDecimal;
/**
- * 鍔犲噺淇濈敵璇锋槑缁嗕俊鎭〃
+ * 鍔犲噺淇濇崲鍘傜敵璇锋槑缁嗕俊鎭〃
* @author 姹熻箘韫�
- * @date 2024/01/15 11:15
+ * @date 2024/01/16 10:03
*/
@Data
-@ApiModel("鍔犲噺淇濈敵璇锋槑缁嗕俊鎭〃")
+@ApiModel("鍔犲噺淇濇崲鍘傜敵璇锋槑缁嗕俊鎭〃")
@TableName("`apply_chagne_detail`")
public class ApplyChagneDetail {
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -74,7 +74,7 @@
@ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
@ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date idcardNo;
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)")
--
Gitblit v1.9.3