From 7d192b36a6010afb776e48bf08b6956a0d30cae3 Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Mon, 11 May 2020 22:39:02 +0800
Subject: [PATCH 1/6] =?UTF-8?q?pom=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/i3plus-pojo-andon/pom.xml      | 3 ++-
 modules/i3plus-pojo-aps/pom.xml        | 4 ++--
 modules/i3plus-pojo-base/pom.xml       | 4 ++--
 modules/i3plus-pojo-form/pom.xml       | 4 ++--
 modules/i3plus-pojo-hardswitch/pom.xml | 3 ++-
 modules/i3plus-pojo-ics/pom.xml        | 4 +++-
 modules/i3plus-pojo-jobflow/pom.xml    | 4 ++--
 modules/i3plus-pojo-lac/pom.xml        | 3 ++-
 modules/i3plus-pojo-mes-pcn/pom.xml    | 4 ++--
 modules/i3plus-pojo-mes/pom.xml        | 4 ++--
 modules/i3plus-pojo-model/pom.xml      | 4 ++--
 modules/i3plus-pojo-platform/pom.xml   | 4 ++--
 modules/i3plus-pojo-ptl/pom.xml        | 4 ++--
 modules/i3plus-pojo-report/pom.xml     | 3 ++-
 modules/i3plus-pojo-softswitch/pom.xml | 4 ++--
 modules/i3plus-pojo-sweb/pom.xml       | 4 ++--
 modules/i3plus-pojo-wms/pom.xml        | 4 ++--
 modules/i3plus-pojo-workflow/pom.xml   | 4 ++--
 pom.xml                                | 2 +-
 19 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index bc7071b..9d4bcf9 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,13 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-andon</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 3d6cbc0..3c603b2 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-aps</artifactId>
     <packaging>jar</packaging>
-
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 96472ad..8debbf6 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-base</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 3937425..0bb5683 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-form</artifactId>
     <packaging>jar</packaging>
-
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
 
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index e12eaee..f927537 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,13 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-hardswitch</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <profiles>
         <profile>
diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml
index 5bfdd66..4c515c4 100644
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@@ -5,12 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-ics</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 8b15a31..939370d 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-jobflow</artifactId>
     <packaging>jar</packaging>
-
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <profiles>
         <profile>
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 7637865..29778e4 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,13 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-lac</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index f9957c9..4f24980 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-mes-pcn</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 409b79a..c7bebed 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-mes</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index 846c302..b5c2cd3 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-model</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index 23f68bd..3dc593d 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-platform</artifactId>
     <packaging>jar</packaging>
-
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 28cf55f..d1db96a 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-ptl</artifactId>
     <packaging>jar</packaging>
-
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index 26a7311..4f23437 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,13 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-report</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
 
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 1b72275..788be96 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-softswitch</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
 
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 910d630..36a40da 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-sweb</artifactId>
     <packaging>jar</packaging>
-
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index e5b4e5c..63d500c 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-wms</artifactId>
     <packaging>jar</packaging>
-
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 0ecf190..f0812c0 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-workflow</artifactId>
     <packaging>jar</packaging>
-
+    <version>1.0-PROD-SNAPSHOT</version>
 
     <profiles>
         <profile>
diff --git a/pom.xml b/pom.xml
index fbbe86f..c4793b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-PROD-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>

From 5004f1703777313aa3d004913e23f17ffd0b4803 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Thu, 14 May 2020 19:53:03 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/i3plus-pojo-mdm/pom.xml | 2 +-
 sonar-project.properties        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml
index d98b7d8..b1911ec 100644
--- a/modules/i3plus-pojo-mdm/pom.xml
+++ b/modules/i3plus-pojo-mdm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-PROD-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/sonar-project.properties b/sonar-project.properties
index 932bdd9..3428e74 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-TEST-SNAPSHOT
+sonar.projectVersion=1.0-PROD-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./

From 53a421b3b97694149675e9f679bff4fdd50a9ed7 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Thu, 14 May 2020 20:16:43 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/i3plus-pojo-andon/pom.xml      | 4 ++--
 modules/i3plus-pojo-aps/pom.xml        | 4 ++--
 modules/i3plus-pojo-base/pom.xml       | 4 ++--
 modules/i3plus-pojo-form/pom.xml       | 4 ++--
 modules/i3plus-pojo-hardswitch/pom.xml | 4 ++--
 modules/i3plus-pojo-ics/pom.xml        | 4 ++--
 modules/i3plus-pojo-jobflow/pom.xml    | 4 ++--
 modules/i3plus-pojo-lac/pom.xml        | 4 ++--
 modules/i3plus-pojo-mdm/pom.xml        | 2 +-
 modules/i3plus-pojo-mes-pcn/pom.xml    | 4 ++--
 modules/i3plus-pojo-mes/pom.xml        | 4 ++--
 modules/i3plus-pojo-model/pom.xml      | 4 ++--
 modules/i3plus-pojo-platform/pom.xml   | 4 ++--
 modules/i3plus-pojo-ptl/pom.xml        | 4 ++--
 modules/i3plus-pojo-report/pom.xml     | 4 ++--
 modules/i3plus-pojo-softswitch/pom.xml | 4 ++--
 modules/i3plus-pojo-sweb/pom.xml       | 4 ++--
 modules/i3plus-pojo-wms/pom.xml        | 4 ++--
 modules/i3plus-pojo-workflow/pom.xml   | 4 ++--
 pom.xml                                | 2 +-
 sonar-project.properties               | 2 +-
 21 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index 9d4bcf9..4988f31 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-andon</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 3c603b2..4104107 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-aps</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 8debbf6..96472ad 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-base</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 0bb5683..9be7e80 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-form</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
 
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index f927537..53cfea6 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-hardswitch</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <profiles>
         <profile>
diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml
index 4c515c4..5e5ef03 100644
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-ics</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 939370d..44c0526 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-jobflow</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <profiles>
         <profile>
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 29778e4..122cb94 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-lac</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml
index b1911ec..d98b7d8 100644
--- a/modules/i3plus-pojo-mdm/pom.xml
+++ b/modules/i3plus-pojo-mdm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index 4f24980..f9957c9 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-mes-pcn</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index c7bebed..409b79a 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-mes</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index b5c2cd3..846c302 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-model</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index 3dc593d..c94172f 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-platform</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index d1db96a..4dd7471 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-ptl</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index 4f23437..c45f09e 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-report</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
 
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 788be96..1b72275 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-softswitch</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
 
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 36a40da..94fb42a 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-sweb</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index 63d500c..cac0256 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-wms</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index f0812c0..af52bb4 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-PROD-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-workflow</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
 
     <profiles>
         <profile>
diff --git a/pom.xml b/pom.xml
index c2104bf..cc8fce6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-PROD-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>
diff --git a/sonar-project.properties b/sonar-project.properties
index 3428e74..932bdd9 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-PROD-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./

From 0352980cde50eeb0cb5980bd142d214853993837 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Fri, 15 May 2020 09:28:33 +0800
Subject: [PATCH 4/6] =?UTF-8?q?bug:=20[8516]=20=E9=87=8D=E6=96=B0=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java           | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
index 83c18ad..0fedc5b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
@@ -123,4 +123,8 @@ public class MesOee extends BaseBean implements Serializable {
     @Transient
     @ApiParam("自定义数据map")
     private List<MesOperateObjectAttribute> operateObjectAttributes;
+
+    @Transient
+    @ApiParam("手工录入集合")
+    private List<String> attributes;
 }

From b741b6950b904b73bbf69176ac36c4df561b70f7 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Fri, 15 May 2020 14:42:48 +0800
Subject: [PATCH 5/6] =?UTF-8?q?bug:=20[8516]=20=E9=87=8D=E6=96=B0=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97bug=201?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java
index e05a54e..9a340e4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java
@@ -50,8 +50,4 @@ public class MesOperateObjectAttribute extends BaseBean implements Serializable
     @Transient
     @ApiParam("属性值")
     private String attributeValue;
-
-    @Transient
-    @ApiParam("是否自定义属性")
-    private boolean customAttribute = false;
 }

From 1ea5b54052c5ba06352908038054b63423fb51cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Fri, 15 May 2020 15:07:09 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=90=E7=94=9F=E6=88=90=E8=B4=A8?=
 =?UTF-8?q?=E6=A3=80=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E8=AE=A9?=
 =?UTF-8?q?=E6=AD=A5=E5=AD=97=E6=AE=B5=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
index c6a3d0a..3f0402c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
@@ -84,6 +84,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @ApiParam("间隔时间")
     private Integer checkInterval = 0;
 
+    @Column(name = "IS_CONCESSION")
+    @ApiParam("是否允许让步")
+    private Integer isConcession = 0;
+
     @Transient
     @ApiParam("检测类型名称")
     private String checkTypeName;