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

jyy

2021-03-25 5857fd14f4608ace25724ba6386d72d210e20870

 zq-erp/src/main/java/com/matrix/system/common/service/impl/SysCompanyServiceImpl.java

@@ -80,6 +80,7 @@
      initGoodsTypeService.initRolePower(sysCompany);

      initShopProductCateService.initShopProductCate(sysCompany);

      initBusParameterSettingService.initBusParameterSetting(sysCompany);

      initBusParameterSettingService.initBusParameterFenxiaoSetting(sysCompany);



      return i;