From a946438f6d69f976c94935f53dd7f326947aba0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 23 一月 2024 15:17:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 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..d12e3b8 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")
@@ -66,16 +67,15 @@
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
@ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥姝㈡湡")
- private String endTime;
+ private Date endTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
- private String startTime;
+ private Date 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,39 @@
@ExcelColumn(name="鎬у埆 0鐢� 1濂�")
private Integer sex;
+ @ApiModelProperty(value = "褰撳墠璐圭敤")
+ @ExcelColumn(name="褰撳墠璐圭敤")
+ private BigDecimal currentFee;
+
+ @ApiModelProperty(value = "鏉ユ簮涓婚敭锛坅pply_chagne_detail锛夊姞鍑忎繚鐢熸垚瀛樺湪", example = "1")
+ @ExcelColumn(name="鏉ユ簮涓婚敭锛坅pply_chagne_detail锛夊姞鍑忎繚鐢熸垚瀛樺湪")
+ private Integer fromId;
+
+ @ApiModelProperty(value = "淇濆崟鍙�")
+ @TableField(exist = false)
+ private String applyCode;
+
+ @ApiModelProperty(value = "鏂规鍚嶇О")
+ @TableField(exist = false)
+ private String solutionName;
+
+ @ApiModelProperty(value = "鎵瑰崟鍙�")
+ @TableField(exist = false)
+ private String validCode;
+
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
+ @TableField(exist = false)
+ private String duName;
+
+ @ApiModelProperty(value = "鍛樺伐鍚嶇О")
+ @TableField(exist = false)
+ private String memberName;
+
+ @ApiModelProperty(value = "宸ョ鍚嶇О")
+ @TableField(exist = false)
+ private String workTypeName;
+
+
+
+
}
--
Gitblit v1.9.3