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
..
Common	添加测温配置项	2023-11-20 13:19:53 +08:00
PM	Merge branch 'feature/high-performance-data-collector' into DevelopBase	2024-02-26 09:35:22 +08:00
Recipe/Sic	修改Recipe C2H4-> UnitName	2023-11-14 15:42:09 +08:00
TM	Merge branch 'feature/high-performance-data-collector' into DevelopBase	2024-02-26 09:35:22 +08:00