From fe15069563f2b0c1bc6290c487bec05f8c0ba9a5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 22 May 2020 12:52:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?resigroup=E6=9C=8D=E5=8A=A1=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi-group/resi-group-server/deploy/docker-compose-dev.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/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
index f820d2d84e..631684c28d 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.28
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.29
     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 3bb225cd36..c0c027a0e8 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.28</version>
+    <version>0.3.29</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

From a557243773c4760e7b88852c7ecc7f4361950305 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 22 May 2020 12:53:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?resigroup=E6=9C=8D=E5=8A=A1=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi-group/resi-group-server/deploy/docker-compose-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
index 6148b0cea6..54732484dd 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.28
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.29
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络