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

xiaoyong931011

2021-03-16 c45db552e4593987248b7833fbe4985b6d80542d

 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java

@@ -244,6 +244,8 @@

   private Long companyId;



   public Long getCompanyId() {
      return companyId;
   }