解决冲突

7 years ago · 11278ac43a
parent 666b7cccda
commit 11278ac43a
1 changed files with 2 additions and 2 deletions
--- 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
@ -1701,8 +1701,8 @@ public class WmsEnumUtil {
     */
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum SN_TYPE {
-        ONE_DIMENSIONAL_CODE(10, "一维码"),
+        ONE_DIMENSIONAL_CODE(10, "1D"),
-        QR_CODE(20, "二维码"),
+        QR_CODE(20, "2D"),
        ALL(30, "ALL");
        private int value;