Merge remote-tracking branch 'origin/master'

44323

2023-10-10 5a7de6a73c756ae8e7af2b3e002d6fb52c5cf04c

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