Merge branch 'master' of http://47.103.92.60:3003/skyversation/web_qp_phone_ui.git into video-streaming

# Conflicts:
#	package-lock.json

Signed-off-by: wandequan <wandequan@163.com>