v_qrcode.js
2.82 KB
-
Merge branch 'wangying' of http://192.168.2.91/gitlab/iot-project-js/doorlock into zjx · 56d95500# Conflicts: # dev/src/lang/zh.json # dev/src/view/doorlockUsers/v_doorlockUser.js # dev/src/view/doorlockUsers/v_index.js # web/lib/js/p.js # web/resources/lang/zh.json # web/view/device/index.html # web/view/doorlockManage/index.html # web/view/doorlockUsers/doorlockUser.html # web/view/doorlockUsers/index.html
朱建香 committed