Merge remote-tracking branch 'origin/master' into master

src/main/java/com/shigongli/entity/TaHouse.java

@@ -44,7 +44,7 @@ public class TaHouse implements Serializable {
     private String address;
 
     @ApiModelProperty(value = "地址简称")
-    private String shorAddress;
+    private String shortAddress;
 
     @ApiModelProperty(value = "经纬度 lng,lat")
     private String lngLat;