合并并解决冲突, 编译通过

CMakeLists.txt

@@ -46,7 +46,6 @@ aux_source_directory(${CMAKE_CURRENT_LIST_DIR}/system SYSTEM_SRC )
 add_executable(terminal
         main.cpp
         ./error_code/error_code.cpp
-        setting.pb.cc
         ${locate_src}
         ${robot_src}
         ${message_src}

lidar_locate/Locate_communicator.cpp

@@ -16,7 +16,7 @@ Locate_communicator::~Locate_communicator()
 {
 
 }
-Error_manager Locate_communicator::locate_request(message::Locate_request_msg request,message::Locate_response_msg& result,unsigned int timeout)
+Error_manager Locate_communicator::locate_request(message::Measure_request_msg request,message::Measure_response_msg& result,unsigned int timeout)
 {
     /*
      * 检查request合法性,以及模块状态

lidar_locate/Locate_communicator.h

@@ -14,7 +14,7 @@
 class Locate_communicator {
 public:
     virtual ~Locate_communicator();
-    Error_manager locate_request(message::Locate_request_msg request,message::Locate_response_msg& result,unsigned int timeout=3000);
+    Error_manager locate_request(message::Measure_request_msg request,message::Measure_response_msg& result,unsigned int timeout=3000);
     static Error_manager create_locate_communicator(std::string str_ip,int port);
     static Locate_communicator* get_instance();
 protected: