Z991239-5197 #comment ST合并后编译

CMakeLists.txt

@@ -285,7 +285,7 @@ if(CONAN_CACHE_CLEAR)
 endif(CONAN_CACHE_CLEAR)
 
 if(MSVC)
-conan_cmake_run(REQUIRES RvcFramework/1.2.0.97@LR04.02_FrameworkLib/dev
+conan_cmake_run(REQUIRES RvcFramework/1.2.0.103@LR04.02_FrameworkLib/dev
 	Audio/2024.0118.01@LR04.02_MediaRes/testing
 BASIC_SETUP CMAKE_TARGETS)
 else()

Module/mod_CardIssuerStand/CardIssuerFSM.h

@@ -13,12 +13,7 @@
 #include "CardAssist.h"
 #include "ICDataElement.h"
 #include "IHttpFunc.h"
-//#include "publicFunExport.h"
-#ifdef RVC_OS_WIN
-#include "json.h"
-#else
 #include "json/json.h"
-#endif //RVC_OS_WIN
 #define REFLECTION(var) #var
 using namespace CardIssuer;
 //using namespace GUIConsole;

Module/mod_upload/UploadFSM.h

@@ -10,13 +10,12 @@
 #include <list>
 #include "IHttpFunc.h"
 #ifdef RVC_OS_WIN
-#include "json.h"
 #include <io.h>
 #else 
 #include "SpUtility.h"
-#include "json/json.h"
-#include <map>
 #endif
+#include <map>
+#include "json/json.h"
 
 #define USER_EVT_JMP_DISABLE	EVT_USER+1
 #define USER_EVT_JMP_ENABLE		EVT_USER+2