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

admin

2019-11-06 4d7db6fd66f5b2c9cae9954e46314f9711ce1e8f

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

@@ -34,6 +34,7 @@
      subSidy("额外补贴"),

      redPackGiveOff("赠送红包完成"),

      redPackReceiveOff("赠送红包领取"),

      redPackGiveBack("红包退回"),

      redPackExchangePass("红包提现成功"),

      redPackExchangeReject("红包提现失败"),

      redPackNewUserReward("新人奖励-完成首笔订单"),