Merge branch 'developer' into 'master'

areaId countyId

See merge request !27

gic-store-api/src/main/java/com/gic/store/dto/StoreInfoDTO.java

@@ -58,7 +58,7 @@ public class StoreInfoDTO implements Serializable {
      */
     private String areaId;
 
-    private String countyId;
+//    private String countyId;
 
     /**
      * 经度
@@ -476,10 +476,10 @@ public class StoreInfoDTO implements Serializable {
     }
 
     public String getCountyId() {
-        return countyId;
+        return areaId;
     }
 
     public void setCountyId(String countyId) {
-        this.countyId = countyId;
+        this.areaId = countyId;
     }
 }