HCL 630f568b7c 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-06-28 15:36:38 +08:00
Modules/Mainframe	1.修改Ramp时间	2023-06-28 14:12:26 +08:00
SicRT	1.进度更新	2023-06-27 15:48:17 +08:00
SicSetup/Sic_Setup	更新库文件（Commit ccea5a5），支持报警响应前和响应后三色灯呈现不同状态。	2023-06-25 16:04:34 +08:00
SicSimulator	更新库文件（Commit ccea5a5），支持报警响应前和响应后三色灯呈现不同状态。	2023-06-25 16:04:34 +08:00
SicUI	1.MfcRor进度提交	2023-06-28 14:09:59 +08:00
ThirdParty/MECF.Framework	1.更新Common库	2023-06-28 15:35:02 +08:00
.gitattributes	Add .gitattributes and .gitignore.	2023-03-03 15:42:00 +08:00
.gitignore	更新忽略文件配置。	2023-05-16 14:54:50 +08:00
Sic08.sln	Mainframe工程更名为SicModules。	2023-04-13 15:35:13 +08:00