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/SalaryParam.java | 4 +++-
1 files changed, 3 insertions(+), 1 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..19f8762 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,7 +79,7 @@
@ApiModelProperty(value = "鏍囧噯鏁伴噺")
@ExcelColumn(name="鏍囧噯鏁伴噺")
- private Integer num;
+ private BigDecimal num;
@ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�")
@ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�")
--
Gitblit v1.9.3