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

xiaoyong931011

2021-04-16 509d10498313921fd795f73b8e7ae9ee43b0a81a

 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;
   
   /**
    * 核销码
@@ -78,6 +81,19 @@

   private Long  companyId;

   /**
    * 收货人
    */
   private String  consignee;
   /**
    * 联系电话
    */
   private String  consigneePhone;
   /**
    * 收货地址
    */
   private String  consigneeAddress;