修改了SatateMangement.cpp文件由于合并分支导致的重复声明问题
This commit is contained in:
@@ -49,7 +49,6 @@ bool StateManagement::OnNewMail(MOOSMSG_LIST &NewMail)
|
|||||||
Json::Value deviceState;
|
Json::Value deviceState;
|
||||||
std::string manualState;
|
std::string manualState;
|
||||||
int missionState;
|
int missionState;
|
||||||
int missionState;
|
|
||||||
|
|
||||||
if(key == "uManual_enable_cmd")
|
if(key == "uManual_enable_cmd")
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user