Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-20 8bd08152f1114f086906fe1d3300d4e58302b371

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

@@ -85,7 +85,7 @@
    */


   private Long  logisticsId;
   private Integer  logisticsId;
   
   /**
    * 中奖记录ID
@@ -114,8 +114,6 @@


   private Long  writeoffUserid;



  
}