Merge branch 'refs/heads/rcs_master' into ctu_conveyor

zhang

2 天以前 af5081bc0d0668d526a204076557a171097ddb8d

 zy-acs-common/src/main/java/com/zy/acs/common/enums/AgvCompleteType.java

@@ -50,4 +50,11 @@
        return null;
    }

    public int getCode() {
        return code;
    }

    public String getDesc() {
        return desc;
    }
}