From 597cae7743fde0ca86efb4659a2ded937fc308ae Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 一月 2021 00:32:28 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/RoomDto.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 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 9ede112..793066e 100644
--- 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,15 @@
**/
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";//鍟嗛摵
private String feeCoefficient;
@@ -40,13 +49,17 @@
private String ownerName;
private String idCard;
private String link;
+ private String roomType;
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 +293,28 @@
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;
+ }
}
--
Gitblit v1.8.0