From 9f88b12d16c83963dad8fb8f79d9eeba2c311518 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 20 八月 2024 09:10:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/res/CollectListRes.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/res/CollectListRes.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/res/CollectListRes.java index 39ee693..f410683 100644 --- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/res/CollectListRes.java +++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/res/CollectListRes.java @@ -5,9 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; -import java.util.List; /** 个人中心 房源列表 @@ -21,6 +19,10 @@ private Integer appuserId; @ApiModelProperty("房源类型 1=出租 2=买卖") private Integer dataType; + @ApiModelProperty("房屋类型id") + private String houseTypeId; + @ApiModelProperty("房屋类型名称") + private String houseTypeName; @ApiModelProperty("标题") private String title; @ApiModelProperty("市id") @@ -40,17 +42,19 @@ @ApiModelProperty("发布时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date insertTime; + @ApiModelProperty("发布时间") + private String time; @ApiModelProperty("展示使用的房源id") private String code; @ApiModelProperty("是否有电梯(0=否,1=是)") private Integer elevator; - @ApiModelProperty("是否有晾晒区(0=否,1=是)") + @ApiModelProperty("晾晒区天台(0=否,1=是)") private Integer dryingArea; @ApiModelProperty("是否有花园(0=否,1=是)") private Integer garden; @ApiModelProperty("是否有车位(0=否,1=是)") private Integer carport; - @ApiModelProperty("是否有平台(0=否,1=是)") + @ApiModelProperty("是否有阳台(0=否,1=是)") private Integer balcony; @ApiModelProperty("是否可养宠物(0=否,1=是)") private Integer keepPet; @@ -80,7 +84,11 @@ private Date upTime; @ApiModelProperty("阳台 花园 。。。") private String head; + @ApiModelProperty("房源审核状态") + private Integer authStatus; + @ApiModelProperty("选择同时出租的租金 月") + private BigDecimal rentalMoney; } -- Gitblit v1.7.1