From cd33651deff9fff7e7d9651b766210771c075190 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期二, 14 九月 2021 17:26:16 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev

---
 java110-bean/src/main/java/com/java110/dto/RoomDto.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/RoomDto.java b/java110-bean/src/main/java/com/java110/dto/RoomDto.java
index a325646..70eb01f 100755
--- a/java110-bean/src/main/java/com/java110/dto/RoomDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/RoomDto.java
@@ -56,6 +56,7 @@
     private String link;
     private String roomType;
     private String roomSubType;
+    private String roomSubTypeName;
     private String roomRent;
     private String roomArea;
 
@@ -68,11 +69,10 @@
 
     private List<FeeDto> fees;
 
-
     private Date createTime;
 
-    private String statusCd = "0";
 
+    private String statusCd = "0";
 
     public String getFeeCoefficient() {
         return feeCoefficient;
@@ -236,7 +236,6 @@
         this.floorNum = floorNum;
     }
 
-
     public String[] getRoomIds() {
         return roomIds;
     }
@@ -356,4 +355,14 @@
     public void setRoomArea(String roomArea) {
         this.roomArea = roomArea;
     }
+
+    public String getRoomSubTypeName() {
+        return roomSubTypeName;
+    }
+
+    public void setRoomSubTypeName(String roomSubTypeName) {
+        this.roomSubTypeName = roomSubTypeName;
+    }
+
+
 }

--
Gitblit v1.8.0