Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

昨天 70930071a49190f414c8d8bc9c9e9795a4096739

 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;
    }
}