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

admin

2019-09-03 74ee9c42c1d87f3724a21e92871bc8c95c8364c6

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

@@ -40,7 +40,7 @@
   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 = "奖励券天天抽";

   public final static String SOURCE_DAILY_REBATE = "天天抽";

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

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