From 951cd384e7b81eb7686e303f77992340cc91e6d1 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 10 九月 2024 09:49:01 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java index 4145a21..15cf0c5 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java @@ -28,7 +28,8 @@ * @return */ PageInfo<GetSiteListDTO> getSiteList(GetSiteList siteList); - + PageInfo<GetSiteListDTO> getSiteList1(Long userId); + /** * 添加站点信息 @@ -67,7 +68,7 @@ * @return */ - PageInfo<SiteVO> pageList(SiteQuery query); + PageInfo<SiteVO> pageList(SiteQuery query,Integer isLogin); /** * 获取站点详情 @@ -89,4 +90,10 @@ */ List<Site> getSiteListGun(); + /** + * 获取站点列表 + * @param query + * @return + */ + List<SiteVO> getMapSiteList(SiteQuery query); } -- Gitblit v1.7.1