finish git rebase

LFtid1056/dealMsg.cpp

@@ -150,7 +150,6 @@ void process_received_message(string mac, string id,const char* data, size_t len
             //处理主动上送的暂态事件报文
             NewTaglogbuffer event = NewTaglogbuffer::createFromData(parser.RecvData.data(), parser.RecvData.size());
 
-<<<<<<< HEAD
             //获取测点id
             std::string mpid;
             get_monitor_id_by_dev_and_seq(id, 1, mpid);
@@ -231,9 +230,6 @@ void process_received_message(string mac, string id,const char* data, size_t len
                 }
             }
             
-
-=======
->>>>>>> 096e590 (add rtdata idx)
             // 获取测点参数
             std::string strScale;//电压等级
             int nPTType;//接线方式