From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/owner/OwnerDto.java |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 50 insertions(+), 1 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
index 126c4b1..c188376 100755
--- 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,7 +1,7 @@
 package com.java110.dto.owner;
 
 import com.java110.dto.PageDto;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -21,6 +21,9 @@
     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"; //绉熷
+    public static final String OWNER_TYPE_CD_TEMP = "1004"; //涓存椂浜哄憳
+    public static final String OWNER_TYPE_CD_OTHER = "1005"; //鍏朵粬
+
 
     public static final String OWNER_FLAG_TRUE = "T";//涓氫富鏍囪瘑 T鏄湡瀹炰笟涓� F 鏄櫄鎷熶笟涓�
     public static final String OWNER_FLAG_FALSE = "F";//涓氫富鏍囪瘑 T鏄湡瀹炰笟涓� F 鏄櫄鎷熶笟涓�
@@ -42,6 +45,7 @@
     private String[] roomIds;
     private String sex;
     private String name;
+    private String nameLike;
     private String link;
     private String address;
     private String remark;
@@ -72,6 +76,10 @@
 
     private String userName;
     private String ownerFlag;
+    private String operate;
+
+    private String startDate;
+    private String endDate;
 
     private List<OwnerAttrDto> ownerAttrDtos;
 
@@ -96,6 +104,7 @@
     private String repairCount;
 
     private String oweFee;
+    private String contractCount;
 
     public String getSex() {
         return sex;
@@ -491,4 +500,44 @@
     public void setOweFee(String oweFee) {
         this.oweFee = oweFee;
     }
+
+    public String getContractCount() {
+        return contractCount;
+    }
+
+    public void setContractCount(String contractCount) {
+        this.contractCount = contractCount;
+    }
+
+    public String getOperate() {
+        return operate;
+    }
+
+    public void setOperate(String operate) {
+        this.operate = operate;
+    }
+
+    public String getNameLike() {
+        return nameLike;
+    }
+
+    public void setNameLike(String nameLike) {
+        this.nameLike = nameLike;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
 }

--
Gitblit v1.8.0