Merge branch 'ty_fix' into score_shop

Helius

2021-11-12 8b2e015759d11561638bdc0ecae070557b387451

 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;