Merge remote-tracking branch 'origin/master'

nickchange

2023-10-17 3f2e0142a6db9720f6429848840ac6b214a1cd1b

 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);