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

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

@@ -59,6 +59,7 @@ public class TaHouse implements Serializable {
     private String wifiPassword;
 
     @ApiModelProperty(value = "其他")
+    @TableField("`desc`")
     private String desc;
 
     @ApiModelProperty(value = "排序")