From 9b843e949685575d6d0bdef531f65c203ac22856 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 2 Feb 2021 20:33:14 +0800 Subject: [PATCH 1/4] sonar --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index ae014e9..0786d8d 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 5af6f3ae7f432aa630261dcb8b47579a62b4353e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 4 Feb 2021 10:58:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=9013795=2020027--=E7=8E=B0=E4=B8=AD?= =?UTF-8?q?=E8=88=AABH=E6=95=B0=E6=8D=AE=E6=A3=80=E9=AA=8C=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=E6=97=A0=E6=B3=95=E5=B0=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=8E=A5=E5=8F=A3=E4=BC=A0=E8=BE=93=E5=88=B0?= =?UTF-8?q?=E8=80=81WMS=E7=B3=BB=E7=BB=9F--2021-01-21=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 278960b..ab1c7e6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -7991,7 +7991,8 @@ public class WmsEnumUtil { public enum BH_SUMMARY_IS_SYNC { INIT(10, "INIT", "初始化"), WAIT_SYNC(20, "WAIT_SYNC", "待同步"), - FINISH_SYNC(30, "FINISH_SYNC", "已同步"); + FINISH_SYNC(30, "FINISH_SYNC", "已同步"), + OLD_WMS_FINISH_SYNC(40, "OLD_WMS_FINISH_SYNC", "老WMS已同步"); private int value; private String code; From 7b3ef8f2687f58701f56185e0eaefd4b4f7482e9 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 4 Feb 2021 11:08:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=9013795=2020027--=E7=8E=B0=E4=B8=AD?= =?UTF-8?q?=E8=88=AABH=E6=95=B0=E6=8D=AE=E6=A3=80=E9=AA=8C=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=E6=97=A0=E6=B3=95=E5=B0=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=8E=A5=E5=8F=A3=E4=BC=A0=E8=BE=93=E5=88=B0?= =?UTF-8?q?=E8=80=81WMS=E7=B3=BB=E7=BB=9F--2021-01-21=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index ab1c7e6..278960b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -7991,8 +7991,7 @@ public class WmsEnumUtil { public enum BH_SUMMARY_IS_SYNC { INIT(10, "INIT", "初始化"), WAIT_SYNC(20, "WAIT_SYNC", "待同步"), - FINISH_SYNC(30, "FINISH_SYNC", "已同步"), - OLD_WMS_FINISH_SYNC(40, "OLD_WMS_FINISH_SYNC", "老WMS已同步"); + FINISH_SYNC(30, "FINISH_SYNC", "已同步"); private int value; private String code; From 462ed4f1de4694ac149fdfdf7c1199ace1c18109 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 4 Feb 2021 11:16:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=9013795=2020027--=E7=8E=B0=E4=B8=AD?= =?UTF-8?q?=E8=88=AABH=E6=95=B0=E6=8D=AE=E6=A3=80=E9=AA=8C=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=E6=97=A0=E6=B3=95=E5=B0=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=8E=A5=E5=8F=A3=E4=BC=A0=E8=BE=93=E5=88=B0?= =?UTF-8?q?=E8=80=81WMS=E7=B3=BB=E7=BB=9F--2021-01-21=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 278960b..ab1c7e6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -7991,7 +7991,8 @@ public class WmsEnumUtil { public enum BH_SUMMARY_IS_SYNC { INIT(10, "INIT", "初始化"), WAIT_SYNC(20, "WAIT_SYNC", "待同步"), - FINISH_SYNC(30, "FINISH_SYNC", "已同步"); + FINISH_SYNC(30, "FINISH_SYNC", "已同步"), + OLD_WMS_FINISH_SYNC(40, "OLD_WMS_FINISH_SYNC", "老WMS已同步"); private int value; private String code;