web/view/device · b09d38d7a8daf5bf738c4bbf128030d219acdc0d · 朱建香 / DoorLock · GitLab

History Find file

Merge branch 'zjx' of http://116.62.143.3:10080/iot-project-js/doorlock into wangying · b09d38d7
```
# Conflicts:
#	web/lib/less/device/device.less
#	web/lib/less/myInfo/help.less
#	web/view/myInfo/help.css
```
wangying committed Jan 05, 2018
b09d38d7

Name	Last commit	Last update
..
alarmInfo.html		Loading commit data...
device.css		Loading commit data...
hijackRecord.html		Loading commit data...
index.html		Loading commit data...
opendoorRecord.html		Loading commit data...
recordList.css		Loading commit data...
remoteOpendoor.html		Loading commit data...