# Conflicts: # dev/src/lang/zh.json # dev/src/view/addDevice/v_wifiAdd.js # dev/src/view/doorlockManage/v_index.js # dev/src/view/doorlockUsers/v_addUnlockInfo.js # dev/src/view/doorlockUsers/v_unlockInfo.js # web/lib/js/p.js # web/lib/less/doorlockManage/doorlockManage.less # web/resources/lang/zh.json # web/view/addDevice/wifiAdd.html # web/view/device/device.css # web/view/doorlockManage/index.html # web/view/doorlockUsers/addUnlockInfo.html # web/view/doorlockUsers/inviteBind.html # web/view/doorlockUsers/unlockInfo.html
