Merge branch '0309' of https://gitlink.org.cn/wlyu/xiuos into 0309

2022-03-17 18:33:11 +08:00
parent be61178e44 e5d124231c
commit c61c6dafea
2 changed files with 7 additions and 0 deletions
--- a/APP_Framework/Framework/control/plc/interoperability/socket/plc_socket.h
+++ b/APP_Framework/Framework/control/plc/interoperability/socket/plc_socket.h
@@ -60,7 +60,11 @@ typedef struct PlcSocketParamStruct{
 }PlcSocketParamType;

 //debug command
+<<<<<<< HEAD
 #define plc_print KPrintf
+=======
+#define plc_print //KPrintf
+>>>>>>> e5d124231c72798f7f77b842cc8c631b79043914
 #define plc_error KPrintf
 #define plc_notice KPrintf