From 5f5f07db32be63e6112ddff7722c1ada10472da5 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 14 八月 2023 18:43:41 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java
index 8036ce9..0a1061e 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java
@@ -230,9 +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="鏍囧噯鏁伴噺")
--
Gitblit v1.9.3