From f2dff53d76a7e9a23e6a2ecfed58ce978dc41442 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 06 九月 2024 18:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java |    5 +++--
 1 files changed, 3 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 e96f7e3..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);
 
 	/**
 	 * 获取站点详情

--
Gitblit v1.7.1