Merge branch 'debug' into 'zhu_url'

# Conflicts: # dev/src/public/defaultConfig.js

Merge branch 'debug' into 'zhu_url'
# Conflicts: # dev/src/public/defaultConfig.js
bf5695a5 · felix · 46952de4 · 02ea3415 · bf5695a5
Commit bf5695a5 authored Jan 03, 2018 by felix
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

dev/src/public/config.js
+1 -1

No files found.
--- a/dev/src/public/config.js
+++ b/dev/src/public/config.js
@@ -24,7 +24,7 @@ export default {
 	"hijackMode": {
 		20: "hijackingAlarm",
 	},
-	"model": "UGEN_SECURITY_SMARTDOOR_YJ2017",
+	"model": "USMARTLOCK_SECURITY_SMARTDOOR_SMART_LOCK",
 	"GET_MSG_INTERVAL": 5000,
 	"wifi_add_timeout": 300000,
 	//门铃晃动间隔时间