Commit Graph

3 Commits

Author SHA1 Message Date
hanqiangqiang 70c836ce84 添加Recipe对比界面加载 2023-11-06 09:22:59 +08:00
SL 40f3f783c1 Merge branch 'develop' into feature/single-session-login
# Conflicts:
#	SicRT/Properties/AssemblyInfo.cs
#	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-22 08:52:45 +08:00
SL ad1f13c3e0 更新库文件(Commit 704daa8),用户登录时首先发起登录请求,请求已登录客户端确认的功能。 2023-09-07 23:32:35 +08:00