Merge branch 'ty_fix' into alpha

Helius

2021-11-09 51c026156e7e0cd75805ef7b61f6dc6eeab7afb6

 zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java

@@ -66,13 +66,14 @@
   private Date  winTime;
   
   /**
    * 状态(1:待兑换 2:待发货  3:已兑换  )
    * 状态(1:待兑换 2:待发货  3:已兑换 4:已失效 )
    */
   private Integer  state;
   public static final int STATE_ONE = 1;
   public static final int STATE_TWO = 2;
   public static final int STATE_THREE = 3;
	
   public static final int STATE_FOUR = 4;

   /**
    * 中奖者ID
    */