From c7be7e1fcd9bb0e813b78b08cd45191883af9ce3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 19 一月 2024 15:34:06 +0800
Subject: [PATCH] 111

---
 server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
index f9ff94d..a49a2be 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
@@ -1,5 +1,6 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +15,7 @@
 /**
  * 鎶曚繚鐢宠鏄庣粏淇℃伅琛�
  * @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
  */
 @Data
 @ApiModel("鎶曚繚鐢宠鏄庣粏淇℃伅琛�")
@@ -32,7 +33,7 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +42,7 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -72,10 +73,9 @@
     @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
     private String startTime;
 
-    @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
-    @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date idcardNo;
+    @ApiModelProperty(value = "韬唤璇佸彿鐮�")
+    @ExcelColumn(name="韬唤璇佸彿鐮�")
+    private String idcardNo;
 
     @ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)", example = "1")
     @ExcelColumn(name="娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)")
@@ -93,4 +93,23 @@
     @ExcelColumn(name="鎬у埆 0鐢� 1濂�")
     private Integer sex;
 
+    @ApiModelProperty(value = "褰撳墠璐圭敤")
+    @ExcelColumn(name="褰撳墠璐圭敤")
+    private BigDecimal currentFee;
+
+    @ApiModelProperty(value = "鍛樺伐鍚嶇О")
+    @TableField(exist = false)
+    private String memberName;
+
+    @ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
+    @TableField(exist = false)
+    private String duName;
+
+    @ApiModelProperty(value = "宸ョ鍚嶇О")
+    @TableField(exist = false)
+    private String workTypeName;
+
+
+
+
 }

--
Gitblit v1.9.3