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

yujian

2020-03-24 f15acf7f2d57db3a32c574b0dfc21f564dca6024

 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java

@@ -42,7 +42,10 @@
      redPackThreeStageReward("第三阶段-连续奖励-好友完成订单"),

      redPackUseSuccess("红包使用成功"),

      redPackUseFail("红包使用失败"),

      redPackForbid("红包功能封禁");

      redPackForbid("红包封禁"),

      redPackForbidRemove("红包解封"),

      redPackDeduct("红包扣除"),

      orderTeamReward("团队奖励");



      private final String desc;