Merge branch 'hive2.0' into api

935090232@qq.com

2021-01-26 ae2efe9a1b627fcfbe61020e9e0a82470a3959d7

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