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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 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;