SIC1016\caipeilun b8e3b8c030 Merge branch '_Bypass_InterLock_ReEdit' into develop ... # 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 # ThirdParty/MECF.Framework/Sicentury.Core.dll		2023-09-25 15:23:25 +08:00
..
Account	新增关闭软件权限，需要修改配置才能ShutDown	2023-08-14 11:51:22 +08:00
DBModel.sql	移除PM Heater视图中配置PSU2输出限制的功能。	2023-08-04 16:08:55 +08:00
EventDefine.xml	更新库文件（Commit ccea5a5），支持报警响应前和响应后三色灯呈现不同状态。	2023-06-25 16:04:34 +08:00
IoProviderConfig.xml	Mainframe工程更名为SicModules。	2023-04-13 15:35:13 +08:00
STEvents.xml	添加三色灯报警	2023-07-24 14:19:48 +08:00
SequenceFormat.xml	Add project files.	2023-03-03 15:42:13 +08:00
System.sccfg	Merge branch '_Bypass_InterLock_ReEdit' into develop	2023-09-25 15:23:25 +08:00