• huyuchen's avatar
    Merge remote-tracking branch 'origin/develop' · 4c9cb524
    huyuchen authored
    # Conflicts:
    #	yifu-common/yifu-common-ekp/src/main/resources/ekpFundConfig.properties
    #	yifu-common/yifu-common-ekp/src/main/resources/ekpIncomeConfig.properties
    #	yifu-common/yifu-common-ekp/src/main/resources/ekpInsuranceConfig.properties
    #	yifu-common/yifu-common-ekp/src/main/resources/ekpOrderConfig.properties
    #	yifu-common/yifu-common-ekp/src/main/resources/ekpSalaryConfig.properties
    #	yifu-common/yifu-common-ekp/src/main/resources/ekpSocialConfig.properties
    #	yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
    #	yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceDetailMapper.java
    #	yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceDetailService.java
    #	yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
    #	yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
    #	yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchReduceVo.java
    #	yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchUpdateVo.java
    #	yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
    4c9cb524
Name
Last commit
Last update
..
FddCompanyInfoMapper.xml Loading commit data...
FddContractAttachInfoMapper.xml Loading commit data...
FddContractInfoMapper.xml Loading commit data...
FddContractTemplateFileMapper.xml Loading commit data...
FddContractTemplateMapper.xml Loading commit data...
FddGlobalFieldInfoMapper.xml Loading commit data...
FddPersonAccountMapper.xml Loading commit data...
FddReqLogMapper.xml Loading commit data...
FddSealInfoMapper.xml Loading commit data...
FddSealPersonAuthMapper.xml Loading commit data...
FddTemplateFieldInfoMapper.xml Loading commit data...
LExcelHeadForIoMapper.xml Loading commit data...
TAttaInfoMapper.xml Loading commit data...
TCertRecordMapper.xml Loading commit data...
TCustomerInfoMapper.xml Loading commit data...
TCutsomerDataPermissonMapper.xml Loading commit data...
TDepartSettlementInfoMapper.xml Loading commit data...
TElecEmployeeInfoMapper.xml Loading commit data...
TEmpBadRecordMapper.xml Loading commit data...
TEmpChangeInfoMapper.xml Loading commit data...
TEmpContractAlertMapper.xml Loading commit data...
TEmpDisabilityInfoMapper.xml Loading commit data...
TEmpEducationMapper.xml Loading commit data...
TEmpFamilyMapper.xml Loading commit data...
TEmpProfessionalQualification.xml Loading commit data...
TEmpWorkRecordingMapper.xml Loading commit data...
TEmployeeContractAreaResMapper.xml Loading commit data...
TEmployeeContractAuditMapper.xml Loading commit data...
TEmployeeContractInfoMapper.xml Loading commit data...
TEmployeeInfoMapper.xml Loading commit data...
TEmployeeLogMapper.xml Loading commit data...
TEmployeeProjectMapper.xml Loading commit data...
TSettleDomainMapper.xml Loading commit data...