fix merge bug

.gitignore

@@ -32,7 +32,6 @@ CMakeFile*
 /etc
 config_file.h
 log.h
-struct_def.h
 three_rates.h
 config.guess
 config.sub

card_car.cpp

@@ -4,7 +4,7 @@
 #include "his_location.h"
 #include "area.h"
 #include "mine.h"
-#include "three_rates.h"
+#include "struct_def.h"
 #include "select_tool.h"
 #include "websocket/ws_common.h"
 #include "special_area.h"

card_person.cpp

@@ -7,7 +7,7 @@
 #include "mine.h"
 #include "his_location.h"
 #include "tool_time.h"
-#include "three_rates.h"
+#include "struct_def.h"
 #include "select_tool.h"
 #include "monkey_car/monkeycar_person.h"
 #include "websocket/ws_common.h"

main.cpp

@@ -8,6 +8,7 @@
 #include "card.h"
 #include "ant.h"
 #include "area.h"
+#include "struct_def.h"
 #include "card_path.h"
 #include "landmark.h"
 #include "special_area.h"
@@ -15,7 +16,6 @@
 #include "event.h"
 #include "module_service/module_mgr.h"
 #include <config_file.h>
-#include "three_rates.h"
 #include "mine_business.h"
 #include "sys_setting.h"
 #include "websocket/web_connect.h"

module_service/module_meta_data_changed.cpp

@@ -10,7 +10,6 @@
 #include "area.h"
 #include "forbid_staff_down_mine.h"
 #include "landmark.h"
-#include <three_rates.h>
 #include "area_business_geofault.h"
 #include <boost/format.hpp>
 #include <boost/tokenizer.hpp>

struct_def.h

@@ -57,4 +57,16 @@ struct area_data{
 	uint64_t leave_time;
 };
 
+struct db_para
+{
+	std::string Host;//数据库主机地址
+	std::string User;//用户名
+	std::string PWD;//密码
+	std::string DBName;//数据库名
+	std::string CharSet;//字符集
+	int TimeOut;
+	int PoolSize;
+	int Port;		//端口
+};
+
 #endif