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

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

@@ -29,7 +29,7 @@ public class TaHouseSurround implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "周边ID")
-    @TableId(value = "surround_id", type = IdType.INPUT)
+    @TableId(value = "surround_id", type = IdType.UUID)
     private String surroundId;
 
     @ApiModelProperty(value = "关联房源")