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

rain

2024-04-07 1982a4f0aea16e109d3f30ddc20c2458ea0f6f31

 src/main/java/com/dji/sample/manage/controller/DeviceController.java

@@ -79,8 +79,8 @@
     * @return
     */
    @GetMapping("/{workspace_id}/devices")
    public ResponseResult<List<DeviceDTO>> getDevices(@PathVariable("workspace_id") String workspaceId) {
        List<DeviceDTO> devicesList = deviceService.getDevicesTopoForWeb(workspaceId);
    public ResponseResult<List<DeviceDTO>> getDevices(@PathVariable("workspace_id") String workspaceId,String reserveId) {
        List<DeviceDTO> devicesList = deviceService.getDevicesTopoForWeb(workspaceId,reserveId);

        return ResponseResult.success(devicesList);
    }