HCL 0d77e22639 Merge branch 'develop' into feature/整理优化数据库代码 ... # Conflicts: # 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-07-10 18:24:23 +08:00
Modules/Mainframe	1.PM Interlock中用DI-7代替DI-6	2023-07-05 13:34:33 +08:00
SicRT	Merge branch 'develop' into feature/整理优化数据库代码	2023-07-10 18:24:23 +08:00
SicSetup/Sic_Setup	修改安装脚本文件CVD.nsi的编码为UTF-8.	2023-07-03 17:13:47 +08:00
SicSimulator	更新库文件（Commit ccea5a5），支持报警响应前和响应后三色灯呈现不同状态。	2023-06-25 16:04:34 +08:00
SicUI	解决PMCharting缺样式问题	2023-07-10 15:16:00 +08:00
ThirdParty/MECF.Framework	Merge branch 'develop' into feature/整理优化数据库代码	2023-07-10 18:24:23 +08:00
.gitattributes	Add .gitattributes and .gitignore.	2023-03-03 15:42:00 +08:00
.gitignore	1.Mfc Ror进度更新，功能基本完成	2023-07-04 09:18:14 +08:00
SicAutoGE.sln	解决方案更名为SicAutoGE，以标识此项目针对含EFEM的自动设备。	2023-07-03 16:07:32 +08:00