Merge remote-tracking branch 'origin/master'

k94314517

2023-08-18 eee82fc63bf8b0b48bda5d6c89a491974a20bc97

 server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java

@@ -117,7 +117,7 @@
//                .set(SalaryParam::getDepartId,salaryParam.getDepartId())
//                .set(SalaryParam::getMaterialId,salaryParam.getMaterialId())
//                .set(SalaryParam::getProcedureId,salaryParam.getProcedureId())
                .set(SalaryParam::getSalary,salaryParam.getSalary().divide(new BigDecimal(100)))
                .set(SalaryParam::getSalary,salaryParam.getSalary().multiply(new BigDecimal(100)))
                .set(SalaryParam::getNum,salaryParam.getNum())
                .set(SalaryParam::getTimes,salaryParam.getTimes())
                .set(SalaryParam::getUnqualified,salaryParam.getUnqualified());