From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 5 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 5d82952..2e53e7f 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
@@ -33,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
-
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
-
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -60,6 +58,9 @@
@ApiModelProperty(value = "鍔犲噺淇濈敵璇风紪鐮侊紙鍏宠仈apply_change)", example = "1")
@ExcelColumn(name="鍔犲噺淇濈敵璇风紪鐮侊紙鍏宠仈apply_change)")
private Integer applyChangeId;
+ @ApiModelProperty(value = "鍔犲噺淇濆悎骞跺崟缂栫爜锛堝叧鑱攗nion_change)", example = "1")
+ @ExcelColumn(name="鍔犲噺淇濆悎骞跺崟缂栫爜锛堝叧鑱攗nion_change)")
+ private Integer unionChangeId;
@ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攎emeber锛�", example = "1")
@ExcelColumn(name="浼佷笟缂栫爜锛堝叧鑱攎emeber锛�")
@@ -73,9 +74,6 @@
@ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
private Date startTime;
- @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
- @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
- private Date idcardNo;
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)")
@ExcelColumn(name="娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)")
@@ -101,26 +99,81 @@
@ExcelColumn(name="鍘熷伐绉嶇紪鐮�")
private Integer oldWorktypeId;
+
+ @ApiModelProperty(value = "鍗曚环(姣忔棩)", example = "1")
+ private BigDecimal price;
+
+ @ApiModelProperty(value = "鏇挎崲涓氬姟锛氬噺淇濇暟鎹噺灏戠殑閲戦", example = "1")
+ private BigDecimal reduceMoney;
+
@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)
private String duName;
+
+ @ApiModelProperty(value = "鎶曚繚鏄庣粏涓婚敭",hidden = true,notes = "鍑忎繚涓氬姟瀛樺偍锛屾彁渚涘鐞嗗埌鍔犱繚鍚庣殑淇濆崟鏄庣粏琛屼笟鍔℃暟鎹笂")
+ @TableField(exist = false)
+ private Integer applyDetailId;
+
@ApiModelProperty(value = "宸ョ鍚嶇О")
@TableField(exist = false)
private String workTypeName;
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
+ @TableField(exist = false)
+ private String oldDuName;
+ @ApiModelProperty(value = "鏂规鍚嶇О")
+ @TableField(exist = false)
+ private String solutionsName;
+ @ApiModelProperty(value = "淇濆崟鍙�")
+ @TableField(exist = false)
+ private String applyCode;
+ @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 = "鏈嶅姟璐�")
+ @TableField(exist = false)
+ private BigDecimal serverCost;
+
+
@ApiModelProperty(value = "淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
@TableField(exist = false)
private Integer solutionTimeUnit;
+ @ApiModelProperty(value = "鎶曚繚鐢宠缂栫爜", example = "1")
+ @TableField(exist = false)
+ private Integer applyId;
+ @ApiModelProperty(value = "鏂规涓婚敭", example = "1")
+ @TableField(exist = false)
+ private Integer solutionId;
+
+ @ApiModelProperty(value = "鍛樺伐浼佷笟鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "鍛樺伐浼佷笟缂栫爜")
+ @TableField(exist = false)
+ private Integer companyId;
+
+ @ApiModelProperty(value = "骞撮緞")
+ @TableField(exist = false)
+ private long age;
}
--
Gitblit v1.9.3