From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/RoomDto.java |   91 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 88 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
old mode 100644
new mode 100755
index 9ede112..7a5cd99
--- a/java110-bean/src/main/java/com/java110/dto/RoomDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/RoomDto.java
@@ -1,5 +1,7 @@
 package com.java110.dto;
 
+import com.java110.dto.fee.FeeDto;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -14,8 +16,19 @@
  **/
 public class RoomDto extends PageDto implements Serializable {
 
-    public static final String STATE_SELL = "2001";
-    public static final String STATE_FREE = "2002";
+    public static final String STATE_SELL = "2001"; // 宸插叆浣�
+    public static final String STATE_FREE = "2002"; //鏈叆浣�
+    public static final String STATE_DELIVERY = "2003";//宸蹭氦鎴�
+    public static final String STATE_RENOVATION = "2005";//宸茶淇�
+    public static final String STATE_SHOP_FIRE = "2006";//宸茬粡绉�
+    public static final String STATE_SHOP_SELL = "2007";//宸插敭
+    public static final String STATE_SHOP_FREE = "2008";//绌洪棽
+    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;
@@ -25,6 +38,7 @@
     private String roomId;
     private String[] roomIds;
     private String layer;
+    private String[] layers;
     private String builtUpArea;
     private String roomNum;
     private String unitId;
@@ -40,13 +54,20 @@
     private String ownerName;
     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;
     private String stateName;
     private String unitNum;
 
     private List<RoomAttrDto> roomAttrDto;
+
+    private List<FeeDto> fees;
 
 
     private Date createTime;
@@ -280,4 +301,68 @@
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String[] getStates() {
+        return states;
+    }
+
+    public void setStates(String[] states) {
+        this.states = states;
+    }
+
+    public String getRoomType() {
+        return roomType;
+    }
+
+    public void setRoomType(String roomType) {
+        this.roomType = roomType;
+    }
+
+    public List<FeeDto> getFees() {
+        return fees;
+    }
+
+    public void setFees(List<FeeDto> fees) {
+        this.fees = fees;
+    }
+
+    public String[] getLayers() {
+        return layers;
+    }
+
+    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