From b08e205f2ca465a80988fb72286481b8ba5b92ef Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 01 七月 2021 14:18:59 +0800
Subject: [PATCH] 代码合并整理
---
HDL_ON/DAL/DriverLayer/Control_TcpServer.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs b/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs
index b305916..82a2caa 100644
--- a/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs
@@ -215,7 +215,7 @@
sendSidObj.id = Control.Ins.msg_id.ToString();
sendSidObj.time_stamp = "";
//杞崲鎴恇us闇�瑕佺殑鏁版嵁鏍煎紡
- var localFunction = DB_ResidenceData.functionList.GetAllFunction();
+ var localFunction = FunctionList.List.GetDeviceFunctionList();
var localFunctionString = Newtonsoft.Json.JsonConvert.SerializeObject(localFunction);
var tcpFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<List<BusSidObj>>(localFunctionString);
--
Gitblit v1.8.0