Merge branch 'dev-zyj' of hanzhengyi/ytCam into master

CamCore/coreobject.cpp

@@ -1230,7 +1230,7 @@ void CoreObject::time_out()
                     repcur++;
                     repcur &= 0x07;
                     if(phonelist.length()>0){
-                        QString data = QString("evt_name=%1&device_code=%2&phone=%3&insert_id=%4&time=%5&bz=%1").arg(type).arg(rep.Device_Code).arg(phonelist).arg(insertId).arg(rep.Event_Time)
+                        QString data = QString("evt_name=%1&device_code=%2&time=%3&insert_id=%4&phone=%5&bz=%6").arg(type).arg(rep.Device_Code).arg(rep.Event_Time).arg(insertId).arg(phonelist).arg(type)
                                 .replace(",","%2C").replace(":","%3A").replace(" ","+");
                         wxThreads[1][wxcur]->appendData(data);
                         wxThreads[0][wxcur]->appendData(data);