From e567a81f9dd15c15981c25576cc83df6331ea2b5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 20 五月 2025 11:19:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 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 0a023a4..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
@@ -99,6 +99,13 @@
@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;
@@ -112,6 +119,11 @@
@ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
@TableField(exist = false)
private String duName;
+
+
+ @ApiModelProperty(value = "鎶曚繚鏄庣粏涓婚敭",hidden = true,notes = "鍑忎繚涓氬姟瀛樺偍锛屾彁渚涘鐞嗗埌鍔犱繚鍚庣殑淇濆崟鏄庣粏琛屼笟鍔℃暟鎹笂")
+ @TableField(exist = false)
+ private Integer applyDetailId;
@ApiModelProperty(value = "宸ョ鍚嶇О")
@TableField(exist = false)
@@ -137,6 +149,11 @@
@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;
@@ -147,6 +164,13 @@
@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