Merge remote-tracking branch 'origin/master'

nickchange

2023-12-08 1b9a01bf5000714b08a75a50dd1f5f3eab65d888

 cloud-server-management/src/main/java/com/dsh/course/feignClient/account/CityClient.java

@@ -13,7 +13,7 @@
    Page<TCityManager> list(CityListQuery listQuery);

    @PostMapping("/base/city/add")
    void add(TCityManager manager);
    Integer add(TCityManager manager);

    @PostMapping("/base/city/getById")
    TCityManager getById(Integer id);