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

jyy

2021-04-07 5394194396290aa232910a571d6f4ef463a92a6b

 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;