Merge branch 'score_shop' into api_score_meger

jyy

2021-05-22 7a8716132ea660525d4790349e05d59b3c369bb6

 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;