From 833c76cfe3e33a8225051405623711ffceccff2e Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期一, 19 一月 2026 16:50:21 +0800
Subject: [PATCH] 合并冲突
---
LB_VisionProcesses/Communicators/TCom/UARTPort.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/LB_VisionProcesses/Communicators/TCom/UARTPort.cs b/LB_VisionProcesses/Communicators/TCom/UARTPort.cs
index c40ad45..31a4028 100644
--- a/LB_VisionProcesses/Communicators/TCom/UARTPort.cs
+++ b/LB_VisionProcesses/Communicators/TCom/UARTPort.cs
@@ -1,4 +1,5 @@
-锘縰sing RJCP.IO.Ports;
+锘縰sing Newtonsoft.Json;
+using RJCP.IO.Ports;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -7,6 +8,7 @@
namespace LB_VisionProcesses.Communicators.TCom
{
+ [JsonObject(MemberSerialization.OptOut)]
public class UARTPort : BaseCommunicator
{
private RJCP.IO.Ports.SerialPortStream SerialPort = new RJCP.IO.Ports.SerialPortStream();
--
Gitblit v1.9.3