Merge branch 'api_score_meger' into alpha

Helius

2022-02-14 c34b0342177c90564ee5c9d3ef25c7442aaf71ba

 zq-erp/src/main/java/com/matrix/system/app/action/ApiShopInfoAction.java

@@ -37,7 +37,6 @@
        if(!DataAuthUtil.hasAllShopAuth()){
            shopInfo.setId(sysUsers.getShopId());
        }
        QueryUtil.setQueryLimitCom(sysUsers.getCompanyId());

        return AjaxResult.buildSuccessInstance(shopInfoService.findByModel(shopInfo));
    }