Merge remote-tracking branch 'origin/master'

nickchange

2023-11-16 b87922420561a35c1e99b67fb6caf3fe30bc8ccf

 cloud-server-account/src/main/java/com/dsh/account/controller/CityManagerController.java

@@ -39,8 +39,8 @@
    /**
     * 获取已有城市管理的省、市
     */
    @ResponseBody
    @RequestMapping("/cityManager/listAll")

    public List<CityManager> listAll(){
        return cityManagerService.listAll();
    }