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
..
DeviceModelPM2.xml	PM2 Alarm13 修改为 Warning15	2024-02-22 09:48:26 +08:00
ProcessDeviceItemsPM2.xml	修改ProcessDeviceItem注册项名称	2023-12-15 10:19:10 +08:00
RealtimeGasFlowPM2.xml	更新版本号至 ## Version 1.1.1.4	2023-11-22 15:58:31 +08:00
_ioDefinePM2.xml	Merge branch 'feature/high-performance-data-collector' into DevelopBase	2024-02-26 09:35:22 +08:00
interlockPM2.xml	PM添加D0-128Interlock配置	2023-11-23 17:46:23 +08:00