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 | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 06d1280..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;
@@ -18,6 +20,9 @@
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";//鍟嗛摵
@@ -53,6 +58,8 @@
private String unitNum;
private List<RoomAttrDto> roomAttrDto;
+
+ private List<FeeDto> fees;
private Date createTime;
@@ -302,4 +309,12 @@
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