合并冲突

main.cpp

@@ -16,8 +16,6 @@
 #include"module_service/module_mgr.h"
 
 #include <config_file.h>
-#include <db/db_api/CDBCommon.h>
-#include "db/db_tool.h"
 #include "three_rates.h"
 #include "mine_business.h"
 #include "main_test.h"