From 2837bdd57f72e386bbf9a725e7b3a13e5eb9e930 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 八月 2023 09:19:57 +0800
Subject: [PATCH] 修复bug
---
server/src/main/java/doumeemes/dao/business/model/SalaryParam.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java b/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
index 122e5cb..9b815db 100644
--- a/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
+++ b/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
@@ -11,6 +11,8 @@
import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
+
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -71,20 +73,17 @@
@NotEmpty(message = "鐗╂枡缂栫爜涓嶈兘涓虹┖")
private Integer materialId;
- @ApiModelProperty(value = "宸ヨ祫缁撴灉锛堝厓)", example = "1")
- @ExcelColumn(name="宸ヨ祫缁撴灉锛堝厓)")
- private Integer salary;
@ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)", example = "1")
@ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)")
- private Integer salaryPrice;
+ private BigDecimal salary;
@ApiModelProperty(value = "鏍囧噯鏁伴噺")
@ExcelColumn(name="鏍囧噯鏁伴噺")
- private Integer num;
+ private BigDecimal num;
@ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�")
@ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�")
- private String times;
+ private Integer times;
@ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
@ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
--
Gitblit v1.9.3