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

---
 java110-bean/src/main/java/com/java110/dto/owner/OwnerDto.java |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/owner/OwnerDto.java b/java110-bean/src/main/java/com/java110/dto/owner/OwnerDto.java
old mode 100644
new mode 100755
index a28a799..1641b68
--- a/java110-bean/src/main/java/com/java110/dto/owner/OwnerDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/owner/OwnerDto.java
@@ -1,6 +1,7 @@
 package com.java110.dto.owner;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.RoomDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -19,6 +20,7 @@
     // 涓氫富鏈汉 1002 瀹跺涵鎴愬憳
     public static final String OWNER_TYPE_CD_OWNER = "1001"; //涓氫富
     public static final String OWNER_TYPE_CD_MEMBER = "1002"; //瀹跺涵鎴愬憳
+    public static final String OWNER_TYPE_CD_RENTING = "1003"; //绉熷
 
 
     private String communityId;
@@ -38,18 +40,23 @@
     private String[] ownerTypeCds;
     private String ownerTypeName;
     private String roomNum;
+    private String roomName;
     private String psId;
     private String num;
     private String idCard;
     private String floorId;
     private String unitId;
     private String state;
+    private String startTime;
+    private String endTime;
 
     private String bId;
 
     private String userName;
 
     private List<OwnerAttrDto> ownerAttrDtos;
+
+    private List<RoomDto> rooms;
 
 
     private Date createTime;
@@ -274,4 +281,36 @@
     public void setOwnerIds(String[] ownerIds) {
         this.ownerIds = ownerIds;
     }
+
+    public List<RoomDto> getRooms() {
+        return rooms;
+    }
+
+    public void setRooms(List<RoomDto> rooms) {
+        this.rooms = rooms;
+    }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

--
Gitblit v1.8.0