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/ext/dto/QueryWorkorderRecordExtDTO.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderRecordExtDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderRecordExtDTO.java
index 686a2e3..fd16f61 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderRecordExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderRecordExtDTO.java
@@ -644,9 +644,10 @@
@ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�", example = "1")
private Integer duration;
- @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝垎)", example = "1")
+ @ApiModelProperty(value = "宸ヨ祫缁撴灉锛堝厓)", example = "1")
private Integer salary;
-
+ @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)", example = "1")
+ private Integer salaryPrice;
@ApiModelProperty(value = "鏍囧噯鏁伴噺", example = "1")
private Integer salaryNum;
--
Gitblit v1.9.3