Merge remote-tracking branch 'origin/master'

luo

2023-10-08 1cb12391db6154f2d1a8fdf8e0506fe3f3eb2f15

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

@@ -62,7 +62,7 @@
     */
    @RequestMapping("/cityManager/getAccount")
    @ResponseBody
    List<CityManager> getAccount(@RequestBody String city){
    public List<CityManager> getAccount(@RequestBody String city){
        return cityManagerService.list(new QueryWrapper<CityManager>().eq("city",city).ne("state",2).ne("state",3));
    }