From 61b396740d284c565cc22badf8e44568bda13a90 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 22:12:04 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
index 2c339cd..e5c75b8 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -278,7 +278,7 @@
}).orElse(0);
salaryParam.setUnqualified(unqualified);
- Integer type = Optional.ofNullable(salaryParamImportDTO.getUnqualified()).map(s -> {
+ Integer type = Optional.ofNullable(salaryParamImportDTO.getType()).map(s -> {
if ("璁′欢".equals(s)) {
return 0;
} else {
--
Gitblit v1.9.3