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

admin

2020-06-29 be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9

 fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java

@@ -22,7 +22,7 @@


   // 券类型

   public enum CouponTypeEnum {

      freeCoupon("免单券"), welfareFreeCoupon("福利免单"), rebatePercentCoupon("返利比提成奖励券"),

      freeCoupon("自购免单券"), welfareFreeCoupon("福利免单"), rebatePercentCoupon("返利比提成奖励券"),

      freeCouponBuy("自购免单券"),freeCouponGive("赠送免单券");

      private final String desc;