Merge remote-tracking branch 'origin/master'

soss-framework/src/main/java/com/soss/framework/web/service/WeixinServiceImpl.java

@@ -614,6 +614,15 @@ public class WeixinServiceImpl  {
                             city.put("value",shop1.getCity());
                             city.put("name",JSONPath.read(areaData,String.format(cityString,province,shop1.getCity())));
                             cityChild.add(city);
+                            JSONObject zone =new JSONObject();
+                            zone.put("value",shop1.getZone());
+                            zone.put("name",JSONPath.read(areaData,String.format(zoneString,province,shop1.getCity(),shop1.getZone())));
+                            List<Shop> shopList = new ArrayList<>();
+                            shopList.add(shop1);
+                            zone.put("shops",shopList);
+                            List<JSONObject> zones = new ArrayList<>();
+                            zones.add(zone);
+                            city.put("children",zones);
                         }
                         
                     }