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

jyy

2021-04-20 fa791f7796c1546b1329b52a3de8d753915cb4d5

 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;



  
}