From add701dd94745e584871c519dd05557737bdea33 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 14 八月 2023 18:43:24 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java b/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java
index 42c564b..8844310 100644
--- a/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java
+++ b/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java
@@ -129,11 +129,11 @@
@ApiModelProperty(value = "妫�楠屽悎鏍兼暟閲�", example = "1")
@ExcelColumn(name="妫�楠屽悎鏍兼暟閲�")
- private Integer qualifiedNum;
+ private BigDecimal qualifiedNum;
@ApiModelProperty(value = "妫�楠屼笉鍚堟牸鏁伴噺", example = "1")
@ExcelColumn(name="妫�楠屼笉鍚堟牸鏁伴噺")
- private Integer unqualifiedNum;
+ private BigDecimal unqualifiedNum;
@ApiModelProperty(value = "妫�楠屾棩鏈�")
@ExcelColumn(name="妫�楠屾棩鏈�")
@@ -163,6 +163,24 @@
@ApiModelProperty(value = "鍏宠仈绁ㄦ嵁绫诲瀷 0宸ュ崟 1绡瓙鏇存崲鍗曡褰�" )
private Integer relobjType;
- //MATERIAL_DONETYPE,MATERIAL_PROCEDURE_ID,RELOBJ_ID銆丷ELOBJ_TYPE
+ @ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�" )
+ private Integer duration;
+ @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝垎)" )
+ private BigDecimal salaryPrice;
+
+ @ApiModelProperty(value = "鏍囧噯鏁伴噺" )
+ private BigDecimal salaryNum;
+
+ @ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�" )
+ private Integer salaryTimes;
+
+ @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�" )
+ private Integer salaryUnqualified;
+
+ @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂" )
+ private Integer salaryType;
+
+ @ApiModelProperty(value = "宸ヨ祫缁撴灉锛堝垎锛�" )
+ private BigDecimal salary;
}
--
Gitblit v1.9.3