Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-10-29 7077d3a7819de3229482e5a9edb4bd895ea2a49f

 ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java

@@ -72,7 +72,7 @@

    @ApiOperation("获取直播地址")
    @ApiOperationSupport(order = 6)
    @GetMapping("/getBoxList/{boxSn}")
    @GetMapping("/getBoxLiveUrl/{boxSn}")
    public AjaxResult getBoxLiveUrl(@PathVariable("boxSn") String boxSn) {
        BoxStreamUrlReceiver boxLiveUrl = tyService.getBoxLiveUrl(boxSn);
        return AjaxResult.success(boxLiveUrl);