From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev

---
 java110-bean/src/main/java/com/java110/dto/RoomDto.java |   47 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 43 insertions(+), 4 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 71e2f5f..70eb01f 100755
--- a/java110-bean/src/main/java/com/java110/dto/RoomDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/RoomDto.java
@@ -26,6 +26,10 @@
     public static final String ROOM_TYPE_ROOM = "1010301";//鏅�氭埧灞�
     public static final String ROOM_TYPE_SHOPS = "2020602";//鍟嗛摵
 
+    public static final String ROOM_SUB_TYPE_PERSON = "110";
+    public static final String ROOM_SUB_TYPE_WORK = "119";
+    public static final String ROOM_SUB_TYPE_HOUSE = "120";
+
 
     private String feeCoefficient;
     private String section;
@@ -51,7 +55,10 @@
     private String idCard;
     private String link;
     private String roomType;
-
+    private String roomSubType;
+    private String roomSubTypeName;
+    private String roomRent;
+    private String roomArea;
 
     private String state;
     private String[] states;
@@ -62,11 +69,10 @@
 
     private List<FeeDto> fees;
 
-
     private Date createTime;
 
-    private String statusCd = "0";
 
+    private String statusCd = "0";
 
     public String getFeeCoefficient() {
         return feeCoefficient;
@@ -230,7 +236,6 @@
         this.floorNum = floorNum;
     }
 
-
     public String[] getRoomIds() {
         return roomIds;
     }
@@ -326,4 +331,38 @@
     public void setLayers(String[] layers) {
         this.layers = layers;
     }
+
+    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;
+    }
+
+
 }

--
Gitblit v1.8.0