From 375cd035755ca4485893a9524b4ce670ac46732d Mon Sep 17 00:00:00 2001
From: lin <lin@pop-os.localdomain>
Date: 星期一, 06 二月 2023 16:43:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java |    2 +-
 1 files changed, 1 insertions(+), 1 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
index ad5f552..ec88b50 100644
--- 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;

--
Gitblit v1.8.0