Merge branch 'dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -191,19 +191,19 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_CODE_TYPE {
 
-        SERIAL_SN("10", "过程条码"),
+        SERIAL_SN(10, "过程条码"),
-        PRODUCT_SN("20", "产品条码"),
+        PRODUCT_SN(20, "产品条码"),
-        PACK_SN("30", "包装条码");
+        PACK_SN(30, "包装条码");
 
-        private String value;
+        private int value;
         private String description;
 
-        MES_CODE_TYPE(String value, String description) {
+        MES_CODE_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
 
-        public String getValue() {
+        public int getValue() {
             return value;
         }
 
@@ -211,7 +211,7 @@ public class MesPcnEnumUtil {
             return description;
         }
 
-        public static String valueOfDescription(String val) {
+        public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {