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

yujian

2020-03-24 f15acf7f2d57db3a32c574b0dfc21f564dca6024

 fanli/src/main/java/com/yeshi/fanli/util/Constant.java

@@ -173,7 +173,7 @@
   public static final int TLJ_NEW_USER_DEFINE = 10;



   // vip奖励券券5张

   public static final int VIP_COUPON_REWARD_NUM = 30;

   public static final int VIP_COUPON_REWARD_NUM = 15;

   // vip赠送免单券5张

   public static final int VIP_COUPON_GIVEFREE_NUM = 5;

   // vip赠送金币