From 3eca8e4741b06c6049fedccd5c0dea4e01b7aa5c Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 15:19:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/dao/business/model/SalaryParam.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 1a79df2..122e5cb 100644
--- a/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
+++ b/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
@@ -71,9 +71,12 @@
@NotEmpty(message = "鐗╂枡缂栫爜涓嶈兘涓虹┖")
private Integer materialId;
- @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)")
+ @ApiModelProperty(value = "宸ヨ祫缁撴灉锛堝厓)", example = "1")
+ @ExcelColumn(name="宸ヨ祫缁撴灉锛堝厓)")
+ private Integer salary;
+ @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)", example = "1")
@ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)")
- private BigDecimal salary;
+ private Integer salaryPrice;
@ApiModelProperty(value = "鏍囧噯鏁伴噺")
@ExcelColumn(name="鏍囧噯鏁伴噺")
--
Gitblit v1.9.3