From 9089eb3c1ec1c95546fa3e947fccc3a09de25303 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Sat, 8 May 2021 10:56:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=88=90=E5=B0=B1=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/resi/group/dto/group/ResiGroupDTO.java   | 6 +-----
 .../com/epmet/modules/group/entity/ResiGroupEntity.java     | 5 -----
 .../modules/topic/service/impl/TopicDraftServiceImpl.java   | 1 -
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java
index 84454b39c9..9ed8c34510 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java
@@ -126,11 +126,7 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
      * 更新时间
      */
 	private Date updatedTime;
-
-    /**
-     * 小组类型(ordinary:楼院小组  branch:支部小组)
-     */
-	private String groupType;
+	
 	private List<ResiGroupMemberDTO> memberList;
 
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
index 4e694c8f31..b50f50a417 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
@@ -89,11 +89,6 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
 	 */
 	private String groupType;
 
-	/**
-	 * 小组类型(ordinary:楼院小组  branch:支部小组)
-	 */
-	private String groupType;
-
 	/**
 	 * 小组等级
 	 */
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
index 1150f4fbb4..eda33096dd 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@@ -811,7 +811,6 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
             }else {
                 breviary.append("语音话题");
             }
-            sendMqMsg(draft.getCreatedBy(), draft.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString());
 
             //2021.4.22 start  sun  因业务调整，新增组内消息记录表，新增话题时相应的初始数据
             GroupMessageEntity messageEntity = new GroupMessageEntity();