From 1f712d545d8cfd4e9dac74d22a67ebf599df1577 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 06 十月 2023 11:24:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java
index fcc65a1..1d8ad07 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java
+++ b/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

--
Gitblit v1.9.3