From 525dae0dec6ba6afbe6bf81b82eb99d69aeb05b5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 八月 2023 15:57:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
server/src/main/java/doumeemes/dao/business/model/SalaryParam.java | 6 ++++--
1 files changed, 4 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 956d71e..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;
/**
@@ -77,11 +79,11 @@
@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