From a4a5677e4b55dc3de91866e64ca5c977c399c7aa Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 19:03:08 +0800
Subject: [PATCH] # 工资表配置表 联调修改
---
server/src/main/java/doumeemes/dao/business/model/Workorder.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 be3da0c..a9f914a 100644
--- a/server/src/main/java/doumeemes/dao/business/model/Workorder.java
+++ b/server/src/main/java/doumeemes/dao/business/model/Workorder.java
@@ -143,8 +143,8 @@
@ExcelColumn(name="妫�楠屼汉鍛樼紪鐮�")
private Integer checkUserId;
- @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑�", example = "1")
- @ExcelColumn(name="宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑�")
+ @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑堛��7鐢熶骇涓�", example = "1")
+ @ExcelColumn(name="宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑堛��7鐢熶骇涓�")
private Integer status;
@ApiModelProperty(value = "鏄惁鏆傚仠 0鏈殏鍋� 1宸叉殏鍋�", example = "1")
@ExcelColumn(name="鏄惁鏆傚仠 0鏈殏鍋� 1宸叉殏鍋�")
@@ -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