Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

5 years ago · 0a51c0e10c
parent 97d7fdbf24 a575b4eed4
commit 0a51c0e10c
1 changed files with 1 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
@ -5720,8 +5720,7 @@ public class WmsEnumUtil {
    public enum DOCK_ORDER_STATUS {
        WAIT_SEND(10, "待送货"),
        ARRIVED(20, "已到达"),
-        RECEIVED(30, "已收货"),
-        CANCELED(40, "已取消");
+        CANCELED(30, "已取消");

        private int value;
        private String description;