From 36448db2aa831d62d3c7354128f250cede7470c3 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 11 八月 2023 17:48:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/dao/business/model/Workorder.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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 238a80a..be3da0c 100644
--- a/server/src/main/java/doumeemes/dao/business/model/Workorder.java
+++ b/server/src/main/java/doumeemes/dao/business/model/Workorder.java
@@ -224,4 +224,29 @@
@ApiModelProperty(value = "宸ュ崟璁惧浜哄憳闆嗗悎" )
@TableField(exist = false)
private List<WorkorderUser> workorderUserList;
+
+
+ @ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�", example = "1")
+ @ExcelColumn(name="鎶ュ伐鏃堕暱锛堢锛�")
+ private Integer duration;
+
+ @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝垎)", example = "1")
+ @ExcelColumn(name="宸ヨ祫鍗曚环锛堝垎)")
+ private Integer salary;
+
+ @ApiModelProperty(value = "鏍囧噯鏁伴噺", example = "1")
+ @ExcelColumn(name="鏍囧噯鏁伴噺")
+ private Integer salaryNum;
+
+ @ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�")
+ @ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�")
+ private String salaryTimes;
+
+ @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
+ private Integer salaryUnqualified;
+
+ @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂", example = "1")
+ @ExcelColumn(name="璁′环鏂瑰紡 0璁′欢 1璁℃椂")
+ private Integer salaryType;
}
--
Gitblit v1.9.3