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

6 years ago · 9ee4956924
parent 6464cbd533 2b848e18e0
commit 9ee4956924
1 changed files with 1 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
@ -1372,7 +1372,7 @@ public class WmsEnumUtil {
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum QC_INFO_STATUS {
        CREATE(10, "新建"),
-        FINISH(20, "待处理"),
+        FINISH(20, "处理中"),
        FAIL(30, "已完成"),
        CLOSE(40, "已关闭"),
        CANCEL(50, "已取消");