From 1f60e2b4b0f2b64f51b45a6ae4a47c41499e6dc6 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 29 Apr 2020 18:31:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=97=B6=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=8B=E7=BB=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/group/ResiGroupDao.xml             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index b00b98e86f..d9475151b7 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -260,6 +260,7 @@
 	gro.ID AS groupId,
 	gro.GROUP_NAME AS groupName,
 	gro.GROUP_HEAD_PHOTO AS groupHeadPhoto,
+	gro.GROUP_INTRODUCTION AS groupIntroduction,
 	oper.READ_FLAG AS readFlag,
 	oper.MESSAGE_TEXT AS messageText,
 	oper.CREATED_TIME AS createdTime,

From 8f7be34e94ed6deb7543488de837b9d2b4b22d79 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 29 Apr 2020 18:36:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E4=BB=8B=E7=BB=8Dbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/resi-group/resi-group-server/docker-compose.yml | 2 +-
 epmet-module/resi-group/resi-group-server/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/docker-compose.yml b/epmet-module/resi-group/resi-group-server/docker-compose.yml
index 306085ac2d..c0d5075e65 100644
--- a/epmet-module/resi-group/resi-group-server/docker-compose.yml
+++ b/epmet-module/resi-group/resi-group-server/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.6
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.7
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index e7467addca..18d40accf5 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.6</version>
+    <version>0.3.7</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>