From 90d9cd8ac8d7575d1cbd6e81ff6ed746ee82289f Mon Sep 17 00:00:00 2001
From: xu-bin-bin <34916924+xu-bin-bin@users.noreply.github.com>
Date: 星期二, 17 十月 2023 09:23:45 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java
old mode 100644
new mode 100755
index 844c9b7..6e2aca3
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java
@@ -1,6 +1,6 @@
//package com.genersoft.iot.vmp.vmanager.record;
//
-//import com.alibaba.fastjson.JSONObject;
+//import com.alibaba.fastjson2.JSONObject;
//import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
//import com.genersoft.iot.vmp.service.IRecordInfoServer;
//import com.genersoft.iot.vmp.storager.dao.dto.RecordInfo;
@@ -13,8 +13,8 @@
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.*;
//
-//@Api(tags = "浜戠褰曞儚")
-//@CrossOrigin
+//@Tag(name = "浜戠褰曞儚")
+//
//@RestController
//@RequestMapping("/api/record")
//public class RecordController {
@@ -22,7 +22,7 @@
// @Autowired
// private IRecordInfoServer recordInfoServer;
//
-// @ApiOperation("褰曞儚鍒楄〃鏌ヨ")
+// //@ApiOperation("褰曞儚鍒楄〃鏌ヨ")
// @ApiImplicitParams({
// @ApiImplicitParam(name="page", value = "褰撳墠椤�", required = true, dataTypeClass = Integer.class),
// @ApiImplicitParam(name="count", value = "姣忛〉鏌ヨ鏁伴噺", required = true, dataTypeClass = Integer.class),
@@ -37,7 +37,7 @@
// return recordList;
// }
//
-// @ApiOperation("鑾峰彇褰曞儚璇︽儏")
+// //@ApiOperation("鑾峰彇褰曞儚璇︽儏")
// @ApiImplicitParams({
// @ApiImplicitParam(name="recordInfo", value = "褰曞儚璁板綍", required = true, dataTypeClass = RecordInfo.class)
// })
--
Gitblit v1.8.0