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

jyy

2021-03-12 a5150265e33e493efd96f8c43f3c46088fe92b55

 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;