# Conflicts:
#	yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeContractInfoMapper.java
#	yifu-mail/yifu-mail-biz/src/main/resources/application-test.yml
#	yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
#	yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
#	yifu-social/yifu-social-biz/src/main/resources/application-dev.yml
#	yifu-social/yifu-social-biz/src/main/resources/application-test.yml