Merge branch 'master' into dev/数据库统合

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceChannelService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
#	web_src/src/components/DeviceList.vue

src/main/java/com/genersoft/iot/vmp/common/enums/ChannelDataType.java

@@ -1,8 +1,5 @@
 package com.genersoft.iot.vmp.common.enums;
 
-import lombok.Getter;
-
-
 /**
  * 支持的通道数据类型
  */