Merge remote-tracking branch 'origin/master'

aijinhui

2023-08-31 a152548db005be9227730a3166dc233d94a52c5f

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

@@ -59,7 +59,10 @@
    private String index() {
        return "test";
    }

    @RequestMapping("/media")
    private String media() {
        return "mediaMTX";
    }
    @GetMapping("/list")
    public @ResponseBody
    AjaxResult list(ArdCameras ardCamera) {