Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

64850858

2021-06-25 0802677d0b609abc8de0f0d882c6dbf483fc1987

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerManger.java

@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp.media.zlm;

import com.alibaba.fastjson.annotation.JSONField;
import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import org.springframework.beans.factory.annotation.Autowired;