dev/src/view/doorlockUsers · c75b8a24d3b4106a61dde75584333f8bfbc61b6f · 朱建香 / DoorLock

Merge branch 'wangying' of http://192.168.2.91/gitlab/iot-project-js/doorlock into zjx · c75b8a24

# Conflicts:
#	dev/src/lang/zh.json
#	dev/src/view/addDevice/v_wifiAdd.js
#	dev/src/view/device/v_index.js
#	dev/src/view/device/v_remoteOpendoor.js
#	web/resources/lang/zh.json
#	web/view/device/index.html
#	web/view/myInfo/index.html

committed Oct 10, 2017

c75b8a24

Name	Last commit	Last update
..
v_addUnlockInfo.js		Loading commit data...
v_addUser.js		Loading commit data...
v_doorlockUsers.js		Loading commit data...
v_editName.js		Loading commit data...
v_index.js		Loading commit data...
v_inviteBind.js		Loading commit data...
v_unlockInfo.js		Loading commit data...