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

zhaowenyu

2025-11-28 d76f8e3b59969d4bf0f1bf4c92730719bd5389d3

 ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java

@@ -213,10 +213,12 @@
        if (propertyEnumOpt.isEmpty()) {
            return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT);
        }
        deviceService.devicePropertySet(dockSn, propertyEnumOpt.get(), param.get(property));
        deviceService.devicePropertySet(dockSn, propertyEnumOpt.get(), param);
        return ResponseResult.success();
    }

    //.get(property)

//    /**
//     * 查询机场设备列表
//     */