~wxr/OnPro.git - Gitblit

概况
操作记录
提交次数
目录
文档
派生
对比

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

Merge remote-tracking branch 'origin/dev-cqy（1.5.9）' into dev--wxr

wxr

2023-03-16 f703a411c0ebdf7ada490fda75b52fd839dae079

 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs

@@ -342,7 +342,7 @@
                    }
                    break;
                //环境检测传感器
                case SPK.SensorEnvironment:
                case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
                case SPK.SensorEnvironment2:
                case SPK.SensorEnvironment3:
                    {

			@@ -342,7 +342,7 @@
			}
			break;
			//环境检测传感器
			case SPK.SensorEnvironment:
			case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
			case SPK.SensorEnvironment2:
			case SPK.SensorEnvironment3:
			{