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

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

     private String address;
 
     @ApiModelProperty(value = "地址简称")
-    private String shorAddress;
+    private String shortAddress;
 
     @ApiModelProperty(value = "经纬度 lng,lat")
     private String lngLat;