Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into dat...

wzy

2021-07-12 4e214289ec907ecb1d14de3e6fcd17b4582257f0

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

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

   private Long companyId;



   public Long getCompanyId() {
      return companyId;
   }