Merge remote-tracking branch 'gitee/master'

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java