From fb4b7e74420e576c8baab78ae5498cdeda92d4a9 Mon Sep 17 00:00:00 2001
From: zhangk <zhangk@gisuni.com>
Date: Sat, 22 Jun 2024 19:21:17 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into develop_zk

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
index 20cbd76..3b19566 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
@@ -151,7 +151,7 @@
 	 * @return
 	 */
 	@ApiOperation(value = "海康设备-海康摄像头云台的控制", notes = "海康设备-海康摄像头云台的控制")
-	@GetMapping(value = "/handleCameraPosition")
+	@GetMapping(value = "/handleCameraPosition2")
 	public R handleCameraPosition(HkVO hk) {
 		// 获取海康播放url
 		String result = controlling(null==hk.getType()?1:hk.getType(),HkConstant.controllingURLs,

--
Gitblit v1.9.3