From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'

---
 java110-bean/src/main/java/com/java110/vo/api/ApiRoomDataVo.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/vo/api/ApiRoomDataVo.java b/java110-bean/src/main/java/com/java110/vo/api/ApiRoomDataVo.java
old mode 100644
new mode 100755
index 99f3336..3561aab
--- a/java110-bean/src/main/java/com/java110/vo/api/ApiRoomDataVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/ApiRoomDataVo.java
@@ -32,11 +32,16 @@
     private String apartment;
     private String apartmentName;
     private String roomType;
-
+    private String roomSubType;
+    private String roomRent;
+    private String roomArea;
+    private String roomSubTypeName;
     private String ownerId;
     private String ownerName;
     private String idCard;
     private String link;
+    private String startTime;
+    private String endTime;
 
     private List<RoomAttrDto> roomAttrDto;
 
@@ -120,7 +125,6 @@
     public void setApartment(String apartment) {
         this.apartment = apartment;
     }
-
 
     public String getUnitNum() {
         return unitNum;
@@ -217,4 +221,52 @@
     public void setRoomType(String roomType) {
         this.roomType = roomType;
     }
+
+    public String getRoomSubType() {
+        return roomSubType;
+    }
+
+    public void setRoomSubType(String roomSubType) {
+        this.roomSubType = roomSubType;
+    }
+
+    public String getRoomRent() {
+        return roomRent;
+    }
+
+    public void setRoomRent(String roomRent) {
+        this.roomRent = roomRent;
+    }
+
+    public String getRoomArea() {
+        return roomArea;
+    }
+
+    public void setRoomArea(String roomArea) {
+        this.roomArea = roomArea;
+    }
+
+    public String getRoomSubTypeName() {
+        return roomSubTypeName;
+    }
+
+    public void setRoomSubTypeName(String roomSubTypeName) {
+        this.roomSubTypeName = roomSubTypeName;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

--
Gitblit v1.8.0