Merge branch 'wangying' of http://192.168.2.91/gitlab/iot-project-js/doorlock into zjx

# Conflicts:
#	dev/src/view/login/v_index.js
#	web/lib/less/doorlockManage/doorlockManage.less
#	web/lib/less/login/login.less
#	web/resources/lang/zh.json
#	web/view/doorlockManage/doorlockManage.css
#	web/view/login/index.html
#	web/view/login/login.css