Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-27 614b0106f079e67bb674a37ede2bd0fe3df2a430

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

@@ -44,6 +44,7 @@
        try {
            Page<TCityManager> page = new Page<>(listQuery.getOffset(), listQuery.getLimit());
            LambdaQueryWrapper<TCityManager> tCityManagerLambdaQueryWrapper = new LambdaQueryWrapper<>();
            tCityManagerLambdaQueryWrapper.ne(TCityManager::getState,3);
            if(ToolUtil.isNotEmpty(listQuery.getProvinceCode())){
                tCityManagerLambdaQueryWrapper.eq(TCityManager::getProvinceCode,listQuery.getProvinceCode());
            }
@@ -65,5 +66,14 @@
    }


    @PostMapping("/base/city/add")
    public void add(@RequestBody TCityManager manager){
        try {
            cityService.save(manager);
        }catch (Exception e){
            e.printStackTrace();
        }
    }


}