From b199c5995fe9bb322cff4ce81fd7db37adb37ef6 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Thu, 16 Jan 2020 17:43:22 +0800
Subject: [PATCH] Merge branches 'dev' and 'test' of
 http://git.estsh.com/i3-IMPP/i3plus-ics into test

# Conflicts:
#	modules/i3plus-ics-console/src/main/resources/application.properties
#	modules/i3plus-ics-gateway/src/main/resources/application.properties
#	modules/i3plus-ics-regist/src/main/resources/application.properties
---
 modules/i3plus-pojo-ptl-pcn/pom.xml | 2 +-
 modules/i3plus-pojo-ptl/pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-ptl-pcn/pom.xml b/modules/i3plus-pojo-ptl-pcn/pom.xml
index ed7ad85..25ad1a1 100644
--- a/modules/i3plus-pojo-ptl-pcn/pom.xml
+++ b/modules/i3plus-pojo-ptl-pcn/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 92de049..0db7b7d 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>