From 2469e13e95969bf2135656ecc54263b1fd273a8b Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Wed, 20 Nov 2019 17:00:49 +0800
Subject: [PATCH 1/5] =?UTF-8?q?pom=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E4=B8=BAPROD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/i3plus-pojo-aps/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 4426ba9..8a9ed9f 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index dd9890a..5e89c84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
i3plus.pojo
i3plus-pojo
pom
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
modules/i3plus-pojo-base
modules/i3plus-pojo-platform
modules/i3plus-pojo-model
From 86171d35b7336e20b182d7912939e375dc6fb8df Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Wed, 20 Nov 2019 17:02:54 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9master=E5=88=86=E6=94=AFp?=
=?UTF-8?q?om=E4=B8=BAPROD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/i3plus-pojo-andon/pom.xml | 2 +-
modules/i3plus-pojo-base/pom.xml | 2 +-
modules/i3plus-pojo-form/pom.xml | 2 +-
modules/i3plus-pojo-hardswitch/pom.xml | 2 +-
modules/i3plus-pojo-jobflow/pom.xml | 2 +-
modules/i3plus-pojo-lac/pom.xml | 2 +-
modules/i3plus-pojo-mes-pcn/pom.xml | 2 +-
modules/i3plus-pojo-mes/pom.xml | 2 +-
modules/i3plus-pojo-model/pom.xml | 2 +-
modules/i3plus-pojo-platform/pom.xml | 2 +-
modules/i3plus-pojo-report/pom.xml | 2 +-
modules/i3plus-pojo-softswitch/pom.xml | 2 +-
modules/i3plus-pojo-sweb/pom.xml | 2 +-
modules/i3plus-pojo-wms/pom.xml | 2 +-
modules/i3plus-pojo-workflow/pom.xml | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index f8fa98e..810ab4a 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index d790ef1..8217526 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index c6141da..1b30904 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index 23e5bee..9791e02 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index c1e2cb9..4310990 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 856da5f..9dbc071 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index 09f2c4a..3bba14d 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 82fdbe8..2ac5b34 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index b7b2dfc..d05424f 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index ec9e100..0e49db7 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index bd09726..3c56db1 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 4c96781..4a5f068 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 2c24e41..9830d2e 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index 18c811c..6c9b589 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 1171f4e..b8240c8 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
From 43a471d996c05af43c19390009a7d9911ec925c8 Mon Sep 17 00:00:00 2001
From: luweihao
Date: Tue, 25 Feb 2020 11:37:56 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9ptl=E9=A1=B9=E7=9B=AEpom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/i3plus-pojo-ptl/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 0db7b7d..faa2bdd 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-TEST-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
From 62cee148cd7e520b2edba63f4552dc32eb9583cc Mon Sep 17 00:00:00 2001
From: joke lin
Date: Fri, 20 Mar 2020 15:04:42 +0800
Subject: [PATCH 4/5] =?UTF-8?q?[bug:=207875=20=E5=AE=A2=E6=88=B7JIT?=
=?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
index 8590fbb..5db7e04 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
@@ -113,7 +113,7 @@ public class MesProductData extends BaseBean implements Serializable {
@Lob
@Column(name = "LINE_DATA")
@ApiParam("生产数据")
- private List lineData;
+ private String lineData;
@Lob
@Transient
From 79788daf8b12c531a967bdc744d42869af5b511c Mon Sep 17 00:00:00 2001
From: "joke.wang"
Date: Fri, 20 Mar 2020 17:20:23 +0800
Subject: [PATCH 5/5] =?UTF-8?q?pom=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/i3plus-pojo-andon/pom.xml | 2 +-
modules/i3plus-pojo-aps/pom.xml | 2 +-
modules/i3plus-pojo-base/pom.xml | 2 +-
modules/i3plus-pojo-form/pom.xml | 2 +-
modules/i3plus-pojo-hardswitch/pom.xml | 2 +-
modules/i3plus-pojo-jobflow/pom.xml | 2 +-
modules/i3plus-pojo-lac/pom.xml | 2 +-
modules/i3plus-pojo-mes-pcn/pom.xml | 2 +-
modules/i3plus-pojo-mes/pom.xml | 2 +-
.../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 2 +-
modules/i3plus-pojo-model/pom.xml | 2 +-
modules/i3plus-pojo-platform/pom.xml | 2 +-
modules/i3plus-pojo-ptl/pom.xml | 2 +-
modules/i3plus-pojo-report/pom.xml | 2 +-
modules/i3plus-pojo-softswitch/pom.xml | 2 +-
modules/i3plus-pojo-sweb/pom.xml | 2 +-
modules/i3plus-pojo-wms/pom.xml | 2 +-
modules/i3plus-pojo-workflow/pom.xml | 2 +-
pom.xml | 2 +-
19 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index 810ab4a..f8fa98e 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 282975a..1414885 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 8217526..d790ef1 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 1b30904..c6141da 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index 9791e02..23e5bee 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 4310990..c1e2cb9 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 9dbc071..856da5f 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index 3bba14d..09f2c4a 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 2ac5b34..82fdbe8 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
index 6c6aeec..6a49f5e 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
@@ -127,5 +127,5 @@ public class MesPlc extends BaseBean implements Serializable {
@Transient
@ApiParam("OPC值")
- private List opcValue;
+ private String opcValue;
}
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index d05424f..b7b2dfc 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index 0e49db7..ec9e100 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index faa2bdd..0db7b7d 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index 3c56db1..bd09726 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 4a5f068..4c96781 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 9830d2e..2c24e41 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index 6c9b589..18c811c 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index b8240c8..1171f4e 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index b2d5808..bca9cbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
i3plus.pojo
i3plus-pojo
pom
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
modules/i3plus-pojo-base
modules/i3plus-pojo-platform