# Conflicts: # History.md # web/lib/less/addDevice/addDevice.less # web/lib/less/bindUser/bindUser.less # web/lib/less/device/device.less # web/lib/less/doorlockManage/doorlockManage.less # web/lib/less/public/core.less # web/lib/less/public/public.less # web/lib/less/public/variables.less # web/resources/lang/zh.json # web/view/addDevice/addDevice.css # web/view/bindUser/bindUser.css # web/view/doorlockManage/doorlockManage.css
