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 | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 a49a2be..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
@@ -67,11 +67,11 @@
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
@ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥姝㈡湡")
- private String endTime;
+ private Date endTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
- private String startTime;
+ private Date startTime;
@ApiModelProperty(value = "韬唤璇佸彿鐮�")
@ExcelColumn(name="韬唤璇佸彿鐮�")
@@ -97,14 +97,30 @@
@ExcelColumn(name="褰撳墠璐圭敤")
private BigDecimal currentFee;
- @ApiModelProperty(value = "鍛樺伐鍚嶇О")
+ @ApiModelProperty(value = "鏉ユ簮涓婚敭锛坅pply_chagne_detail锛夊姞鍑忎繚鐢熸垚瀛樺湪", example = "1")
+ @ExcelColumn(name="鏉ユ簮涓婚敭锛坅pply_chagne_detail锛夊姞鍑忎繚鐢熸垚瀛樺湪")
+ private Integer fromId;
+
+ @ApiModelProperty(value = "淇濆崟鍙�")
@TableField(exist = false)
- private String memberName;
+ 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