Merge branch 'api' into hive2.0

935090232@qq.com

2021-01-26 36e3950ade8195a7d2fcea64c5118e3ddeec8c44

 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));
    }