Merge branch 'test'

6 years ago · b4dc0c254b
parent 901fea5339 24bbd75c81
commit b4dc0c254b
1 changed files with 5 additions and 1 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
@ -766,7 +766,11 @@ public class WmsEnumUtil {
     */
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum IS_GENERAL_TASK {
-        CREATE(10, "CREATE", "创建"), INIT(20, "INIT", "初始化"), IS_GENERAL(30, "IS_GENERAL", "已生成"), NO_GENERAL(40, "NO_GENERAL", "不生成");
+        CREATE(10, "CREATE", "创建"),
+        INIT(20, "INIT", "初始化"),
+        IS_GENERAL(30, "IS_GENERAL", "已生成"),
+        NO_GENERAL(40, "NO_GENERAL", "不生成"),
+        CANCEL(50,"CANCEL","撤销");

        private int value;
        private String code;