Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-08 d6e902a48df4264d6dbf6ff0c9799c3c30c9d9ff

 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;
   
   /**
    * 核销码