Liang Su 7ec1499c61 Merge branch 'feature/high-performance-data-collector' into DevelopBase ... # Conflicts: # Modules/Mainframe/Devices/IoInterLock.cs # Modules/Mainframe/Devices/SiemensIoProvider.cs # SicRT/Config/System.sccfg # SicRT/Properties/AssemblyInfo.cs # SicSimulator/Config/_ioDefinePM.xml # SicSimulator/Instances/SimulatorModulePlc.cs # SicUI/Properties/AssemblyInfo.cs # ThirdParty/MECF.Framework/MECF.Framework.Common.dll # ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll # ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll # ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll # ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll # ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll # ThirdParty/MECF.Framework/Sicentury.Core.dll # ThirdParty/MECF.Framework/Sicentury.Localization.dll # ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll		2024-02-26 09:35:22 +08:00
..
UnitAlarmDefine	Update from svn.	2023-03-28 13:24:11 +08:00
DeviceModelSystem.xml	1.解决一些问题	2024-01-15 08:48:28 +08:00
IODefinePlatform.xml	更新库文件c7513e1，合并Develop分支最新更改。	2024-01-15 11:28:10 +08:00
interlock.xml	1.do改为di	2024-02-01 14:20:00 +08:00