• hongguangwu's avatar
    Merge branch 'MVP1.7.9' into develop · 98580dfc
    hongguangwu authored
    # Conflicts:
    #	yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
    #	yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
    #	yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceExportListOneVO.java
    #	yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceExportListVO.java
    #	yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysUserPermissionMapper.xml
    98580dfc
Name
Last commit
Last update
..
src/main Loading commit data...
pom.xml Loading commit data...