SIC1016\caipeilun 11ead07a13 Merge branch '行星旋转平台/Develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into 行星旋转平台/Develop ... # Conflicts: # SicRT/Properties/AssemblyInfo.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 # ThirdParty/MECF.Framework/Sicentury.Core.dll # ThirdParty/MECF.Framework/Sicentury.Localization.dll # ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll		2024-08-22 15:45:59 +08:00
..
Controls	温度控制UI界面	2024-08-05 09:57:33 +08:00
Converter	…
Dialog	…
Models	Merge branch '行星旋转平台/Develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into 行星旋转平台/Develop	2024-08-22 15:45:59 +08:00
Properties	更新库文件 修改蝶阀设置界面配置无效	2024-08-22 15:00:32 +08:00
Resources/Images	…
Themes	…
App.config	…
App.xaml	…
App.xaml.cs	…
Bootstrapper.cs	…
ClientApp.cs	…
GlobalUsings.cs	…
MainView.xaml	…
MainView.xaml.cs	…
MainViewModel.cs	…
RtIpAddressInput.xaml	…
RtIpAddressInput.xaml.cs	…
RtIpAddressSetting.ico	…
SicUI.csproj	温度控制UI界面	2024-08-05 09:57:33 +08:00
Splash.xaml	…
Splash.xaml.cs	…
StartupArguments.cs	…
TimeredMainViewModel.cs	…