Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yj

2020-03-13 2f2860b50f24e5e3598d223db03d43df61d95c97

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

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

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

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

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

      redPackForbid("红包封禁"),

      redPackForbidRemove("红包解封"),

      redPackDeduct("红包扣除");



      private final String desc;