From c0e3f1cb4fcf2e94f51ae0acba49962faa0e12bf Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Thu, 2 Apr 2020 11:08:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E6=89=BE=E5=9B=9E=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 2dad813..64f03c6 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
@@ -5502,6 +5502,10 @@ public class WmsEnumUtil {
         WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"),
         WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围");
 
+        int value;
+        String code;
+        String description;
+
         WAVE_MERGE_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
@@ -5725,6 +5729,14 @@ public class WmsEnumUtil {
         }
 
         public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {

From 9b3dd796550e0df399f541c9054563637f6c4454 Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Thu, 2 Apr 2020 11:10:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=86=B2=E7=AA=81=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 68 +++++++++++++++++------------------------------------------------
 1 file changed, 18 insertions(+), 50 deletions(-)

diff --git a/pom.xml b/pom.xml
index d6a60cc..7a083c9 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-${profileActive}-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>
@@ -202,24 +202,24 @@
     </distributionManagement>
 
     <!--<build>-->
-        <!--<plugins>-->
-            <!--<plugin>-->
-                <!--<groupId>org.springframework.boot</groupId>-->
-                <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
-            <!--</plugin>-->
+    <!--<plugins>-->
+    <!--<plugin>-->
+    <!--<groupId>org.springframework.boot</groupId>-->
+    <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
+    <!--</plugin>-->
 
-            <!--&lt;!&ndash;  添加编译插件 &ndash;&gt;-->
-            <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-compiler-plugin</artifactId>-->
-                <!--<version>3.5.1</version>-->
-                <!--<configuration>-->
-                    <!--<source>1.8</source>-->
-                    <!--<target>1.8</target>-->
-                    <!--<encoding>UTF-8</encoding>-->
-                <!--</configuration>-->
-            <!--</plugin>-->
-        <!--</plugins>-->
+    <!--&lt;!&ndash;  添加编译插件 &ndash;&gt;-->
+    <!--<plugin>-->
+    <!--<groupId>org.apache.maven.plugins</groupId>-->
+    <!--<artifactId>maven-compiler-plugin</artifactId>-->
+    <!--<version>3.5.1</version>-->
+    <!--<configuration>-->
+    <!--<source>1.8</source>-->
+    <!--<target>1.8</target>-->
+    <!--<encoding>UTF-8</encoding>-->
+    <!--</configuration>-->
+    <!--</plugin>-->
+    <!--</plugins>-->
     <!--</build>-->
     <profiles>
         <profile>
@@ -254,36 +254,4 @@
         <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
-    <profiles>
-        <profile>
-            <id>dev</id>
-            <properties>
-                <profileActive>DEV</profileActive>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-        <profile>
-            <id>test</id>
-            <properties>
-                <profileActive>TEST</profileActive>
-            </properties>
-        </profile>
-        <profile>
-            <id>docker</id>
-            <properties>
-                <profileActive>DOCKER</profileActive>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <properties>
-                <profileActive>PROD</profileActive>
-            </properties>
-        </profile>
-    </profiles>
-    <build>
-        <finalName>${project.artifactId}-${project.version}</finalName>
-    </build>
 </project>
\ No newline at end of file