Merge remote-tracking branch 'origin/dev' into dev

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++) {

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>
@@ -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>