Commit 58359731af96253883d4e0e3cb812e90d35ae754

Authored by rui.zhang

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ 5835973
... ... @@ -320,6 +320,8 @@
320 320 map.put("cityId", organization.getCityId());
321 321 map.put("province", organization.getProvince());
322 322 map.put("provinceId", organization.getProvinceId());
  323 + map.put("foreignId",organization.getForeignId());
  324 + map.put("code",organization.getShortCode());
323 325 return map;
324 326 }
325 327 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java View file @ 5835973
... ... @@ -50,6 +50,7 @@
50 50 region.put("id",config.getId());
51 51 region.put("regionName",config.getName());
52 52 region.put("parentId", config.getParentId());
  53 + region.put("code", config.getCode());
53 54 list.add(region);
54 55 }
55 56 }