Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-29 c44e660304d6599d90e23da0e52f2c734a81c2ec

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

@@ -164,6 +164,8 @@
      PageInfo<GetSiteListDTO> list = siteService.getSiteList(siteList);
      return AjaxResult.success(list);
   }
	
	
   @GetMapping("/getSiteList/byUserId")
   @ApiOperation(value = "获取站点列表", tags = {"管理后台-站点管理"})
   public R<List<GetSiteListDTO>> getSiteListByUserId(@RequestParam("userId") Long userId){