Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-09-01 324ed9fac852bc4117ee0da65a586adef258bd52

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java

@@ -108,8 +108,7 @@
   @ApiOperation(value = "获取充电桩列表数据", tags = {"管理后台-充电桩信息"})
   public AjaxResult<PageInfo<PageChargingPileListDTO>> pageChargingPileList(PageChargingPileList page){
      SysUser sysUser = tokenService.getLoginUser().getSysUser();
      Integer siteId = sysUser.getSiteId();
      PageInfo<PageChargingPileListDTO> list = chargingPileService.pageChargingPileList(page,siteId);
      PageInfo<PageChargingPileListDTO> list = chargingPileService.pageChargingPileList(page,sysUser);
      return AjaxResult.success(list);
   }