Merge branch 'master' of http://jiecheng2024.tpddns.cn:3000/liyuezong/SmartPDCode

Conflicts:
	pro/src/websocket_handle.c

pro/src/cascade.c

@@ -612,7 +612,7 @@ static int master_scan(cascade_handle_t *cas)
             slave_add(cas, cas->scanAddr);
         }
         else {
-            LOGW("____ scan %d fail, %s\n", cas->scanAddr, modbus_strerror(errno));
+           // LOGW("____ scan %d fail, %s\n", cas->scanAddr, modbus_strerror(errno));
         }
     }
     cas->scanAddr++;