Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

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

@@ -24,9 +24,10 @@
   

   

   // 来源: 新人抽奖、邀请奖励

   public final static String SOURCE_CHOUJIANG = "新人抽奖";

   public final static String SOURCE_NEWBIES = "新人抽奖";

   public final static String SOURCE_YAOQING = "邀请奖励";

   public final static String SOURCE_SYSTEM_PUSH = "系统赠送";

   public final static String SOURCE_DAILY_REBATE = "奖励券天天抽";

   

   @Expose

   @Column(name = "usc_id")