-
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
