Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

zhou zhou

2 天以前 53526a6c99085577969aec2cdd0a13fe35394e0b

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java

@@ -66,7 +66,7 @@
        if (Objects.isNull(waitPakinPda)) {
            return R.error("参数不能为空！！");
        }
        return agvService.AGVInTaskStart(waitPakinPda, getLoginUserId());
        return agvService.AGVBindAndInTaskStart(waitPakinPda, getLoginUserId());
    }

    @ApiOperation("AGV绑定&入库")