# Conflicts: # dev/src/lang/zh.json # web/lib/less/device/notify.less # web/lib/less/doorlockUsers/doorlockUser.less # web/view/device/index.html # web/view/device/notify.css # web/view/device/notify.html # web/view/doorlockUsers/doorlockUser.css # web/view/doorlockUsers/inviteBind.html