Merge remote-tracking branch 'origin/master'

admin

2019-03-13 f50254e4666734ee038d93169869915f43d7b4a1

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

@@ -26,6 +26,7 @@
   // 来源: 新人抽奖、邀请奖励

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

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

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

   

   @Expose

   @Column(name = "usc_id")