Merge branch 'api' into hive2.0

jyy

2021-03-09 708fd530fe4c1565ca2f20707a911b03e59c925f

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