# Conflicts: # dev/src/lang/zh.json # dev/src/view/addDevice/v_scanCodeAdd.js # dev/src/view/doorlockManage/v_editName.js # dev/src/view/doorlockManage/v_index.js # dev/src/view/doorlockManage/v_qrcode.js
