Merge remote-tracking branch 'gitee.com/wvp-28181-2.0' into wvp-28181-2.0

648540858

2023-01-04 809e4c98c5c801b05ad22116a69728f8d3751abb

 src/main/java/com/genersoft/iot/vmp/conf/WVPTimerTask.java

@@ -1,6 +1,6 @@
package com.genersoft.iot.vmp.conf;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import org.springframework.beans.factory.annotation.Autowired;