From a8c87a18fed28e8cd06b20de9def11631f80ab96 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 16:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/feign/UYClient.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/feign/UYClient.java b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
index 5286b2a..44d25b8 100644
--- a/ycl-server/src/main/java/com/ycl/feign/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
@@ -8,7 +8,6 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
/**
* @author gonghl
@@ -22,11 +21,11 @@
/**
* 涓�鏈轰竴妗�
*
- * @param cameraParam 璇锋眰鍙傛暟
+ * @param oneMachineFileParam 璇锋眰鍙傛暟
* @return 鏌ヨ鎽勫儚鏈烘竻鍗曢泦鍚�
*/
@GetMapping("/VIID/Cameras")
- JSONObject cameraList(@SpringQueryMap CameraParam cameraParam);
+ JSONObject oneMachineFile(@SpringQueryMap OneMachineFileParam oneMachineFileParam);
/**
* 鐐逛綅鍦ㄧ嚎
@@ -65,5 +64,5 @@
* @return
*/
@GetMapping("/api/v1/app/report/vqd/detail/list")
- JSONObject queryVqdResult(@SpringQueryMap VideoQualityParam param);
+ JSONObject videoQuality(@SpringQueryMap VideoQualityParam param);
}
--
Gitblit v1.8.0