Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-06 1f712d545d8cfd4e9dac74d22a67ebf599df1577

 ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java

@@ -65,7 +65,7 @@
    }
    @RequestMapping("/media")
    private String media() {
        return "mediaMTX";
        return "preview2";
    }
    @GetMapping("/list")
    public @ResponseBody