Han Qiang Qiang 71f13ea50c Merge branch 'Sic8ToSic6' into feature/测温重构 ... # Conflicts: # SicRT/Instances/ToolLoader.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-15 15:54:46 +08:00
..
Account	C2H4修改为C3H8	2023-11-14 10:43:36 +08:00
DBModel.sql	测试dll	2023-12-13 16:27:12 +08:00
EventDefine.xml	更新多用户登录机制：	2023-10-06 09:50:11 +08:00
IoProviderConfig.xml	Mainframe工程更名为SicModules。	2023-04-13 15:35:13 +08:00
Menu.xml	1添加Process查询界面配置	2023-12-05 08:52:41 +08:00
STEvents.xml	SignalTower配置文件STEvent.xml中增加使用说明注释。	2023-11-23 15:39:28 +08:00
SequenceFormat.xml	Add project files.	2023-03-03 15:42:13 +08:00
System.sccfg	Merge branch 'Sic8ToSic6' into feature/测温重构	2023-12-15 15:54:46 +08:00