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

Xiajijian

2025-10-13 7df12dc3e9940768a3936b93500a9d3a2935d02b

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

@@ -34,9 +34,9 @@

    @ApiOperation("获取六合token信息")
    @ApiOperationSupport(order = 1)
    @GetMapping("/getToken")
    public AjaxResult getToken() {
        return AjaxResult.success(tyService.getAccessToken());
    @GetMapping("/getToken/{serverId}")
    public AjaxResult getToken(@PathVariable("serverId") String serverId) {
        return AjaxResult.success(tyService.getAccessToken(serverId));
    }

    @ApiOperation("获取六合盒子列表")