Merge remote-tracking branch 'origin/div' into div

yujian

2020-04-16 c57f9a24c525aa557225b663fa55120a36f99735

Merge remote-tracking branch 'origin/div' into div

 fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java

@@ -60,8 +60,8 @@
        subsidy("额外补贴", "http://img.flqapp.com/resource/msg/icon_msg_subsidy.png", ""),

        

        

        teamReward("团队收益", "http://img.flqapp.com/resource/money_detail/icon_invite.png", ""),

        teamDividents("团队分红", "http://img.flqapp.com/resource/money_detail/icon_invite.png", ""),

        teamReward("团队收益", "http://img.flqapp.com/resource/money_detail/icon_team_income.png", ""),

        teamDividents("团队分红", "http://img.flqapp.com/resource/money_detail/icon_team_dividents.png", ""),

        fanliNew("自购返利", "http://img.flqapp.com/resource/money_detail/icon_fanli.png", ""),

        orderRewardNew("返利再返", "http://img.flqapp.com/resource/money_detail/icon_order_reward.png", ""),

        shareNew("分享奖金", "http://img.flqapp.com/resource/money_detail/icon_share.png", ""),