Merge branch 'wangying' of http://192.168.2.91/gitlab/iot-project-js/doorlock into zjx
# Conflicts: # History.md # web/lib/js/p.js # web/lib/less/addDevice/addDevice.less # web/lib/less/device/device.less # web/lib/less/public/animation.less # web/lib/less/public/core.less # web/lib/less/public/public.less # web/resources/font/iconfont.ttf # web/resources/lang/zh.json # web/view/addDevice/addDevice.css # web/view/device/device.css
Showing
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
No preview for this file type
web/resources/image/doorlockManage.png
0 → 100644
2.43 KB
web/resources/image/doorlockUser.png
0 → 100644
2.6 KB
web/resources/image/gray_door_icon.png
0 → 100644
1.79 KB
web/resources/image/green_doorbell_icon.png
0 → 100644
2.48 KB
web/resources/image/white_message_icon.png
0 → 100644
1.3 KB