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

jyy

2021-04-09 f96ad6ec73b3da7df5c08471f0d567d46fc767e8

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

@@ -56,6 +56,9 @@


   private Integer  state;

   public static final int STATE_ING = 1;
   public static final int STATE_DONE = 2;
   
   /**
    * 核销码