From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期五, 08 十二月 2023 17:18:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-other/src/main/java/com/dsh/other/controller/TRegionController.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/TRegionController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/TRegionController.java index 528f178..4267948 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/controller/TRegionController.java +++ b/cloud-server-other/src/main/java/com/dsh/other/controller/TRegionController.java @@ -19,13 +19,12 @@ public class TRegionController { - @Resource private IRegionService regionService; @PostMapping("/base/region/getCityAndProvince") - public List<CityDataAndProvinceDataVo> getCityAndProvince(@RequestBody List<Integer> ids){ + public List<CityDataAndProvinceDataVo> getCityAndProvince(@RequestBody List<Integer> ids) { List<CityDataAndProvinceDataVo> cityDataAndProvinceDataVos = new ArrayList<>(); try { List<Region> list = regionService.list(new LambdaQueryWrapper<Region>() @@ -42,7 +41,7 @@ } } return cityDataAndProvinceDataVos; - }catch (Exception e){ + } catch (Exception e) { return cityDataAndProvinceDataVos; } } -- Gitblit v1.7.1