SIC1016\caipeilun 6b3d985945 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop_configChangedV2 ... # 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		2023-10-20 16:32:28 +08:00
..
DeviceModelPM1.xml	优化: TM开闸板阀时腔体压力直接使用PT1的Feedback，不另外建立IoPressureMeter3s	2023-10-12 17:28:57 +08:00
RealtimeGasFlowPM1.xml	1删除旧的真值表配置和初始化	2023-07-17 17:13:59 +08:00
_ioDefinePM1.xml	1修改PM的CoolingWater,U10水温参数明配置错误问题	2023-08-17 16:42:29 +08:00
interlockPM1.xml	Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic08 into develop_configChangedV2	2023-10-20 16:32:28 +08:00