Merge remote-tracking branch 'origin/master'

nickchange

2023-11-16 b87922420561a35c1e99b67fb6caf3fe30bc8ccf

 cloud-server-management/src/main/java/com/dsh/course/feignClient/other/SiteClient.java

@@ -51,7 +51,7 @@
     * @return
     */
    @RequestMapping("/base/site/addSite")
    Object addSite(@RequestBody Site site);
    Integer addSite(@RequestBody Site site);

    @RequestMapping("/base/site/listById")
    Site listById(@RequestParam("id") Integer id);