Commit 3aef3a48 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21

parents 689c722c f82734a8
...@@ -89,7 +89,7 @@ public class TSalaryZeroVo extends RowIndex implements Serializable { ...@@ -89,7 +89,7 @@ public class TSalaryZeroVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "减除费用", isNotEmpty = true, errorInfo = "减除费用不能为空") @ExcelAttribute(name = "减除费用", isNotEmpty = true, errorInfo = "减除费用不能为空")
@Schema(description = "减除费用") @Schema(description = "减除费用")
@ExcelProperty("减除费用") @ExcelProperty("减除费用")
private BigDecimal costReduction; private String costReduction;
/** /**
* 计税月份 * 计税月份
*/ */
......
...@@ -208,6 +208,7 @@ public class SalaryConstants { ...@@ -208,6 +208,7 @@ public class SalaryConstants {
public static final String VIEW_DAY_NAME_PRE = "view_salary_zero_day_"; public static final String VIEW_DAY_NAME_PRE = "view_salary_zero_day_";
public static final String MONEY_ERROR = "减除费用金额仅限5000~60000且是5000的倍数"; public static final String MONEY_ERROR = "减除费用金额仅限5000~60000且是5000的倍数";
public static final String MONEY_NUM_ERROR = "减除费用只能是金额,不能是汉字等其他字符";
public static final String DEPT_ERROR = "根据项目编码未找到项目信息"; public static final String DEPT_ERROR = "根据项目编码未找到项目信息";
public static final BigDecimal COST_MONEY = new BigDecimal("5000"); public static final BigDecimal COST_MONEY = new BigDecimal("5000");
// 最大减除费用 // 最大减除费用
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment