From 775bf2d08b8a7a9f22d445b77106ce67d0c75fc0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 29 一月 2021 11:22:29 +0800
Subject: [PATCH] 2021-01-29 1.增加萤石云功能相关库和资源文件，目前有冲突还无法编译
---
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
old mode 100644
new mode 100755
index b305916..82a2caa
--- 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