From be0301e67768fb183df7e29f411a7e54dbf15c40 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 五月 2024 10:37:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java | 8 ++++++++
1 files changed, 8 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 127994e..4113d79 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,11 @@
@ExcelColumn(name="鍘熷伐绉嶇紪鐮�")
private Integer oldWorktypeId;
+
+ @ApiModelProperty(value = "鍗曚环(姣忔棩)", example = "1")
+ private BigDecimal price;
+
+
@ApiModelProperty(value = "鍛樺伐鍚嶇О")
@TableField(exist = false)
private String memberName;
@@ -150,6 +155,9 @@
@ApiModelProperty(value = "鍛樺伐浼佷笟鍚嶇О")
@TableField(exist = false)
private String companyName;
+ @ApiModelProperty(value = "鍛樺伐浼佷笟缂栫爜")
+ @TableField(exist = false)
+ private Integer companyId;
@ApiModelProperty(value = "骞撮緞")
@TableField(exist = false)
--
Gitblit v1.9.3