From 5698783410b463ac5a228fc37eb516a6d13fa047 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 15:24:50 +0800
Subject: [PATCH] # 工资表配置表 工资单价数据代码合并
---
server/src/main/java/doumeemes/dao/business/model/SalaryParam.java | 5 +----
1 files changed, 1 insertions(+), 4 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..956d71e 100644
--- a/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
+++ b/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
@@ -71,12 +71,9 @@
@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="鏍囧噯鏁伴噺")
--
Gitblit v1.9.3