Han Qiang Qiang 17e1128fae Merge branch 'Sic8ToSic6' into feature/测温重构 ... # Conflicts: # SicRT/Properties/AssemblyInfo.cs # SicRT/ReleaseNotes.md # 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		2023-12-12 13:58:34 +08:00
..
DeviceManager.cs	Merge branch 'Sic8ToSic6' into feature/测温重构	2023-12-12 13:58:34 +08:00
EquipmentManager.cs	添加Common.XML配置文件，用来初始化设备共用硬件	2023-11-01 10:49:43 +08:00