From 1db674e411cba7d0d98a86a7bc8ae369c9d0cff9 Mon Sep 17 00:00:00 2001
From: quowingwang <guoqingwang.ruizhiao>
Date: Sat, 20 Dec 2025 15:48:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=AD=A6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Model/MES/andon/AndonAlarmRecord.cs  | 16 ++++++++--------
 ZR.Service/Utils/MyMatchPush/Watchup.cs |  1 +
 ZR.Service/ZR.Service.csproj            |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ZR.Model/MES/andon/AndonAlarmRecord.cs b/ZR.Model/MES/andon/AndonAlarmRecord.cs
index 6d05dd1a..e0e1ce0f 100644
--- a/ZR.Model/MES/andon/AndonAlarmRecord.cs
+++ b/ZR.Model/MES/andon/AndonAlarmRecord.cs
@@ -43,49 +43,49 @@ namespace ZR.Model.MES.andon
         /// 接收方 
         /// </summary>
         [SugarColumn(ColumnName = "receiver1")]
-        public string Receiver1 { get; set; }
+        public string? Receiver1 { get; set; }
 
         /// <summary>
         /// 接收方名称 
         /// </summary>
         [SugarColumn(ColumnName = "receiver1_name")]
-        public string Receiver1Name { get; set; }
+        public string? Receiver1Name { get; set; }
 
         /// <summary>
         /// 接收方 
         /// </summary>
         [SugarColumn(ColumnName = "receiver2")]
-        public string Receiver2 { get; set; }
+        public string? Receiver2 { get; set; }
 
         /// <summary>
         /// 接收方名称 
         /// </summary>
         [SugarColumn(ColumnName = "receiver2_name")]
-        public string Receiver2Name { get; set; }
+        public string? Receiver2Name { get; set; }
 
         /// <summary>
         /// 接收方 
         /// </summary>
         [SugarColumn(ColumnName = "receiver3")]
-        public string Receiver3 { get; set; }
+        public string? Receiver3 { get; set; }
 
         /// <summary>
         /// 接收方名称 
         /// </summary>
         [SugarColumn(ColumnName = "receiver3_name")]
-        public string Receiver3Name { get; set; }
+        public string? Receiver3Name { get; set; }
 
         /// <summary>
         /// 接收方 
         /// </summary>
         [SugarColumn(ColumnName = "receiver4")]
-        public string Receiver4 { get; set; }
+        public string? Receiver4 { get; set; }
 
         /// <summary>
         /// 接收方名称 
         /// </summary>
         [SugarColumn(ColumnName = "receiver4_name")]
-        public string Receiver4Name { get; set; }
+        public string? Receiver4Name { get; set; }
 
         /// <summary>
         /// 序号 
diff --git a/ZR.Service/Utils/MyMatchPush/Watchup.cs b/ZR.Service/Utils/MyMatchPush/Watchup.cs
index 7d04fcd3..2be7c141 100644
--- a/ZR.Service/Utils/MyMatchPush/Watchup.cs
+++ b/ZR.Service/Utils/MyMatchPush/Watchup.cs
@@ -13,6 +13,7 @@ namespace DOAN.ServiceCore.MyMatchPush
         private static int PackageSort = 1;
         public static bool StartPush(string message, SocketGatewayServer _socketGateway)
         {
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
             //发送报警信息
             //包头
diff --git a/ZR.Service/ZR.Service.csproj b/ZR.Service/ZR.Service.csproj
index 00737af8..04f88932 100644
--- a/ZR.Service/ZR.Service.csproj
+++ b/ZR.Service/ZR.Service.csproj
@@ -14,6 +14,7 @@
 
 	<ItemGroup>
 	  <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+	  <PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>