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

jyy

2021-03-17 1739422c2ab97afea38b08d4bd5468093e264ca2

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

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

   private Long companyId;



   public Long getCompanyId() {
      return companyId;
   }