Merge branch 'refs/heads/rcs_master' into ctu_conveyor

zhang

23 小时以前 af5081bc0d0668d526a204076557a171097ddb8d

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java

@@ -192,7 +192,7 @@
            case 0:
                return false;
            default:
                return null;
                return false;
        }
    }

@@ -204,7 +204,7 @@
            case 0:
                return false;
            default:
                return null;
                return false;
        }
    }

@@ -216,7 +216,7 @@
            case 0:
                return false;
            default:
                return null;
                return false;
        }
    }