From f18b35727a11a5f8b5e326f6045f49b571954ba3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 09 六月 2025 11:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java
index c8dee68..30bc547 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java
@@ -52,5 +52,19 @@
 	 * @return
 	 */
 	@PostMapping("/site/getSiteListPaging")
-	PageInfo<Site> getSiteListPaging(@RequestParam("PageNo") Integer PageNo, @RequestParam("PageSize") Integer PageSize);
+	PageInfo<Site> getSiteListPaging(@RequestParam("PageNo") Integer PageNo,
+	                                 @RequestParam("PageSize") Integer PageSize,
+	                                 @RequestParam("ids") List<String> ids);
+	
+	
+	/**
+	 * 分页查询站电数据
+	 * @param PageNo
+	 * @param PageSize
+	 * @return
+	 */
+	@PostMapping("/site/getSiteListPagingJianGuan")
+	PageInfo<Site> getSiteListPagingJianGuan(@RequestParam("PageNo") Integer PageNo,
+	                                 @RequestParam("PageSize") Integer PageSize,
+	                                 @RequestParam("ids") List<String> ids);
 }

--
Gitblit v1.7.1