From 86b4742e122bb3ff19f8b61574b4bbf8e5db4b11 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期六, 12 十二月 2020 19:35:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath --- 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