decision添加数据库接口

src/decision/decision.cpp

@@ -11,7 +11,7 @@ namespace decision {
 std::string Decision::Name() const { return "decision"; }
 
 int Decision::Init(){
-<<<<<<< HEAD
+
     LOG(INFO)<<Name()<<":Decision init...";
     Database::InitDB();
     Database::InsertActionDirective("1",1,"1",1);
@@ -25,10 +25,10 @@ int Decision::Init(){
 //    Database::DeleteLocationRuleInfo("1");
     Database::DeleteLocationRuleInfo(1);
     return 0;
-=======
+
     LOG(INFO)<<Name()<<"Decision init...";
     return ROBOT_SUCCESS;
->>>>>>> 759ecb392596608d195b9c0ff234e1e42401a6f8
+
 }
 
 int Decision::Start(){