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

lawrencehj

2021-03-14 03ec48e32c9122e1ab0c69ceb6fc56461c697c80

 src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceQuery.java

@@ -17,11 +17,11 @@
import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;

import javax.sip.message.Response;

@SuppressWarnings("rawtypes")
@CrossOrigin
@RestController
@RequestMapping("/api")