From 960380f89c9371ba309d6c50b1ab1b677ea74575 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 26 八月 2025 20:51:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- 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 3e3329b..b93d49b 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 @@ -11,6 +11,7 @@ import com.ruoyi.chargingPile.dto.SiteDTO; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.PageInfo; +import com.ruoyi.system.api.domain.SysUser; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -30,7 +31,7 @@ * @return */ PageInfo<GetSiteListDTO> getSiteList(GetSiteList siteList); - List<GetSiteListDTO> getSiteListNolimit(GetSiteList siteList); + List<GetSiteListDTO> getSiteListNolimit(GetSiteList siteList, SysUser sysUser); PageInfo<GetSiteListDTO> getSiteList1(Long userId); @@ -48,7 +49,7 @@ * @param site * @return */ - AjaxResult editSite(Site site); + AjaxResult editSite(SiteDTO dto); /** -- Gitblit v1.7.1