合并主干代码，解决冲突

module_service/area_business_speed_checker.cpp

@@ -144,14 +144,6 @@ void area_business_speed_checker::on_leave(const std::shared_ptr<area_hover>&are
     {
         return;
     }
-<<<<<<< HEAD
-    auto ptr_temp = dynamic_cast<over_speed_data*>(ptr.get());
-    if (ptr_temp == nullptr)
-    {
-        return ;
-    }
-=======
-
     if(nullptr == ptr)
     {
         log_error("area_business_speed_checker::on_leave：nullptr == ptr");
@@ -159,7 +151,6 @@ void area_business_speed_checker::on_leave(const std::shared_ptr<area_hover>&are
     }
 
     auto ptr_temp = static_cast<over_speed_data*>(ptr.get());
->>>>>>> f3b13c3aeeb7bc3622df4964279da2e41ed23f17
     double limit = ptr_temp ->m_limit_speed;
 
     EVENT_TYPE ev_type = ET_CARD_AREA_OVER_SPEED;