qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/2.1.2.2211.01' into release/2.1.2.2211.01

This commit is contained in:
钱涛 2022-11-02 20:10:28 +08:00
parent c29ee34c1e 3f6b549789
commit 1f2c2433e4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java
View File

@ -25,7 +25,7 @@ public class InsuranceArchivesBO {
}
return InsuranceArchivesSocialSchemeDTO.builder()
.socialName(po.getSocialSchemeId() == null ? null : String.valueOf(po.getSocialSchemeId()))
.socialSchemeId(po.getSocialSchemeId() == null ? null : String.valueOf(po.getSocialSchemeId()))
.socialSchemeId(po.getSocialSchemeId())
.welfareType(SalaryEnumUtil.enumMatchByValue(po.getWelfareType(), WelfareTypeEnum.values(), WelfareTypeEnum.class))
.id(po.getId())
.employeeId(po.getEmployeeId())

2
src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesSocialSchemeDTO.java
View File

@ -41,7 +41,7 @@ public class InsuranceArchivesSocialSchemeDTO {
private String socialName;
//社保方案id
private String socialSchemeId;
private Long socialSchemeId;
//private List<WeaSearchConditionOption> siSocialList;