From b4b44f2021dbf083b7057fb7e192b72d08b4bf17 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 09:23:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 b24a0eb..367d6da 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
@@ -4,6 +4,7 @@
 import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
 import com.ruoyi.chargingPile.api.model.Site;
 import com.ruoyi.chargingPile.api.query.GetSiteList;
+import com.ruoyi.chargingPile.api.query.SiteDetailQuery;
 import com.ruoyi.chargingPile.api.query.SiteQuery;
 import com.ruoyi.chargingPile.api.vo.SiteDetailVO;
 import com.ruoyi.chargingPile.api.vo.SiteVO;
@@ -28,7 +29,8 @@
 	 * @return
 	 */
 	PageInfo<GetSiteListDTO> getSiteList(GetSiteList siteList);
-	
+	PageInfo<GetSiteListDTO> getSiteList1(Long userId);
+
 	
 	/**
 	 * 添加站点信息
@@ -71,10 +73,10 @@
 
 	/**
 	 * 获取站点详情
-	 * @param siteId
+	 * @param query
 	 * @return
 	 */
-	SiteDetailVO getDetailById(Integer siteId);
+	SiteDetailVO getDetailById(SiteDetailQuery query);
 
 	/**
 	 * 获取站点列表不分页 管理后台-停车场绑定

--
Gitblit v1.7.1