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

1

1 天以前 f9ae4dd16bc60281d7c2f7489e45d4f17896b659

 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绑定&入库")