- 
fangxinjiang authored# Conflicts: # yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TIncomeMapper.java # yifu-social/yifu-social-biz/src/main/resources/mapper/TIncomeMapper.xml 615398bf
# Conflicts: # yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TIncomeMapper.java # yifu-social/yifu-social-biz/src/main/resources/mapper/TIncomeMapper.xml