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

admin

2019-11-13 221b5c8d0de3f6b17a00d543503a79c13b28ba12

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

@@ -26,6 +26,7 @@
      freeCouponGive("赠送免单券"),

      couponReward("奖励券"),

      taoLiJin("推广红包"),

      taoLiJinExchange("推广红包兑换金币"),

      give("赠送"),

      exchange("金币兑换"),

      couponActivate("免单券激活"),