From 44f9cd5c403584c39c8bb893f69244e4835daab8 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期三, 19 二月 2020 12:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 java110-bean/src/main/java/com/java110/dto/CommunityMemberDto.java |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/CommunityMemberDto.java b/java110-bean/src/main/java/com/java110/dto/CommunityMemberDto.java
index 391f651..fc4443e 100644
--- a/java110-bean/src/main/java/com/java110/dto/CommunityMemberDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/CommunityMemberDto.java
@@ -1,23 +1,33 @@
 package com.java110.dto;
 
+import com.java110.dto.community.CommunityDto;
+
 import java.io.Serializable;
 
 /**
  * 灏忓尯鎴愬憳dto
  */
-public class CommunityMemberDto extends PageDto implements Serializable {
+public class CommunityMemberDto extends CommunityDto implements Serializable {
 
     private String communityMemberId;
 
     private String communityId;
+    private String communityName;
 
     private String memberId;
+    private String subMemberId;
 
     private String memberTypeCd;
 
     private String auditStatusCd;
 
-    private String statusCd;
+    private String[] auditStatusCds;
+
+    private String statusCd = "0";
+
+    private boolean needCommunityInfo;
+
+    private boolean noAuditEnterCommunity;
 
     public String getCommunityMemberId() {
         return communityMemberId;
@@ -66,4 +76,44 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public boolean isNeedCommunityInfo() {
+        return needCommunityInfo;
+    }
+
+    public void setNeedCommunityInfo(boolean needCommunityInfo) {
+        this.needCommunityInfo = needCommunityInfo;
+    }
+
+    public boolean isNoAuditEnterCommunity() {
+        return noAuditEnterCommunity;
+    }
+
+    public void setNoAuditEnterCommunity(boolean noAuditEnterCommunity) {
+        this.noAuditEnterCommunity = noAuditEnterCommunity;
+    }
+
+    public String[] getAuditStatusCds() {
+        return auditStatusCds;
+    }
+
+    public void setAuditStatusCds(String[] auditStatusCds) {
+        this.auditStatusCds = auditStatusCds;
+    }
+
+    public String getCommunityName() {
+        return communityName;
+    }
+
+    public void setCommunityName(String communityName) {
+        this.communityName = communityName;
+    }
+
+    public String getSubMemberId() {
+        return subMemberId;
+    }
+
+    public void setSubMemberId(String subMemberId) {
+        this.subMemberId = subMemberId;
+    }
 }

--
Gitblit v1.8.0