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

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

@@ -681,4 +681,33 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 通用条码枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMMON_SN {
+        QUEUE_SN("QUEUE_SN", "队列条码");
+
+        private String code;
+        private String description;
+        int value;
+
+        COMMON_SN(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }