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

admin

2019-11-06 4d7db6fd66f5b2c9cae9954e46314f9711ce1e8f

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

@@ -22,6 +22,9 @@
   public final static int STATE_FREE_ON = 2;

   public final static int STATE_SUCCESS = 3;

      

   public final static int STATE_GIVE_ON = 11; // 增送中

		
	
   

   @Column(name = "ucr_id")

   private Long id;