diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java index ed3e5c8..02dc95b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java @@ -92,6 +92,9 @@ public class CommonController { JsonNode districts = jsonNode.get("districts"); String text = districts.toString(); List cityInfoList = mapper.readValue(text, mapper.getTypeFactory().constructCollectionType(List.class, DistrictVo.class)); + DistrictVo allCity=new DistrictVo(); + allCity.setName("全城"); + cityInfoList.add(0,allCity); return Result.success(CodeEnum.SUCCESS, cityInfoList); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/DistrictVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/DistrictVo.java index bfda3ac..186eef5 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/DistrictVo.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/DistrictVo.java @@ -9,10 +9,10 @@ import java.util.List; */ @Data public class DistrictVo { - private Object citycode; - private Object adcode; - private Object name; - private Object center; - private Object level; + private String citycode; + private String adcode; + private String name; + private String center; + private String level; private List districts; }