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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/TokenRecord.java

@@ -16,7 +16,7 @@
   

   // 口令类型

   public enum TokenTypeEnum {

      freeCoupon("免单券"), rebatePercentCoupon("返利比提成奖励券"),taoLiJin("推广红包"), ;

      freeCoupon("免单券"), rebatePercentCoupon("返利比提成奖励券"),taoLiJin("推广红包"),redPack("红包") ;

      private final String desc;



      private TokenTypeEnum(String desc) {