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
..
Maintenances	更新库文件41202af，优化Data History左侧列表的水温名称。	2023-09-14 09:38:06 +08:00
Operations/Overviews	MainView中增加账号异地登录确认和踢出逻辑。	2023-09-20 17:50:00 +08:00
PMs	Merge branch 'develop' into feature/single-session-login	2023-09-22 08:52:45 +08:00
LocalUIViewModelBase.cs	移除PMProcessView视图、ProcessMonitor视图。	2023-06-29 14:44:35 +08:00