From f8b1073fbb28d37e08016eed32c682f8c5eae391 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 二月 2024 17:26:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 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 8965f23..4e4de3a 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
@@ -67,20 +67,16 @@
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
@ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥姝㈡湡")
- private String endTime;
+ private Date endTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
- private String startTime;
+ private Date startTime;
- @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
- @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
-
- private Date idcardNo;
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)")
@ExcelColumn(name="娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)")
- private String duId;
+ private Integer duId;
@ApiModelProperty(value = "宸ョ缂栫爜", example = "1")
@ExcelColumn(name="宸ョ缂栫爜")
@@ -94,9 +90,23 @@
@ExcelColumn(name="绫诲瀷 0鍔� 1鍑� 2鎹㈠巶")
private Integer type;
+ @ApiModelProperty(value = "鍘熸淳閬ｅ崟浣嶇紪鐮侊紙鍏宠仈dispatch_unit)")
+ @ExcelColumn(name="鍘熸淳閬ｅ崟浣嶇紪鐮侊紙鍏宠仈dispatch_unit)")
+ private String oldDuId;
+
+ @ApiModelProperty(value = "鍘熷伐绉嶇紪鐮�", example = "1")
+ @ExcelColumn(name="鍘熷伐绉嶇紪鐮�")
+ private Integer oldWorktypeId;
+
@ApiModelProperty(value = "鍛樺伐鍚嶇О")
@TableField(exist = false)
private String memberName;
+ @ApiModelProperty(value = "鍛樺伐韬唤璇佸彿")
+ @TableField(exist = false)
+ private String memberIdcardNo;
+ @ApiModelProperty(value = "鎬у埆 0鐢� 1濂�")
+ @TableField(exist = false)
+ private Integer sex;
@ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
@TableField(exist = false)
@@ -105,5 +115,26 @@
@ApiModelProperty(value = "宸ョ鍚嶇О")
@TableField(exist = false)
private String workTypeName;
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
+ @TableField(exist = false)
+ private String oldDuName;
+
+ @ApiModelProperty(value = "宸ョ鍚嶇О")
+ @TableField(exist = false)
+ private String oldWorkTypeName;
+
+ @ApiModelProperty(value = "韬唤璇佸彿")
+ @TableField(exist = false)
+ private String idcardNo;
+ @ApiModelProperty(value = "淇濋櫓璐圭敤(浜�/澶╋級", example = "1")
+ @TableField(exist = false)
+ private BigDecimal solutionPrice;
+
+ @ApiModelProperty(value = "淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
+ @TableField(exist = false)
+ private Integer solutionTimeUnit;
+ @ApiModelProperty(value = "鎶曚繚鐢宠缂栫爜", example = "1")
+ @TableField(exist = false)
+ private Integer applyId;
}
--
Gitblit v1.9.3