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

admin

2020-06-29 be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9

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

@@ -45,6 +45,7 @@
   public final static String SOURCE_DAILY_REBATE = "天天抽";

   public final static String SOURCE_EXCHANGE = "金币兑换";

   public final static String SOURCE_GIVE = "好友赠送";

   public final static String SOURCE_PULL_NEW = "拉新奖励";

   

   @Expose

   @Column(name = "usc_id")