From 3eca8e4741b06c6049fedccd5c0dea4e01b7aa5c Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 15:19:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/dao/business/model/Workorder.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/model/Workorder.java b/server/src/main/java/doumeemes/dao/business/model/Workorder.java
index 7967078..a9f914a 100644
--- a/server/src/main/java/doumeemes/dao/business/model/Workorder.java
+++ b/server/src/main/java/doumeemes/dao/business/model/Workorder.java
@@ -230,10 +230,12 @@
@ExcelColumn(name="鎶ュ伐鏃堕暱锛堢锛�")
private Integer duration;
- @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝垎)", example = "1")
- @ExcelColumn(name="宸ヨ祫鍗曚环锛堝垎)")
+ @ApiModelProperty(value = "宸ヨ祫缁撴灉锛堝厓)", example = "1")
+ @ExcelColumn(name="宸ヨ祫缁撴灉锛堝厓)")
private Integer salary;
-
+ @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)", example = "1")
+ @ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)")
+ private Integer salaryPrice;
@ApiModelProperty(value = "鏍囧噯鏁伴噺", example = "1")
@ExcelColumn(name="鏍囧噯鏁伴噺")
private Integer salaryNum;
--
Gitblit v1.9.3