v_editName.js
3.54 KB
-
Merge branch 'wangying' of http://192.168.2.91/gitlab/iot-project-js/doorlock into zjx · f0e198e0# Conflicts: # dev/src/lang/zh.json # dev/src/view/addDevice/v_wifiAdd.js # dev/src/view/addDevice/v_wifiAddHelp.js # dev/src/view/device/v_index.js # dev/src/view/device/v_remoteOpendoor.js # web/lib/js/p.js # web/resources/lang/zh.json # web/view/device/index.html # web/view/myInfo/index.html
朱建香 committed