Merge branch 'Dev-Branch' into wjc

wjc

2023-06-05 e27305d6720bb4238307731f95c03e5e38f19380

 HDL_ON/Entity/Function/Function.cs

@@ -1681,9 +1681,9 @@
        /// </summary>
        public const string SensorPir = "sensor.pir";
        /// <summary>
        /// 人体移动传感器（带持续时间）
        /// 人体存在传感器
        /// </summary>
        public const string sensorPirhold = "sensor.pir_hold";
        public const string SensorPirHold = "sensor.pir_hold";
        /// <summary>
        /// （门窗传感器）
        /// </summary>
@@ -1740,6 +1740,7 @@
            //spkList.Add(SensorLight);
            spkList.Add(sensorPirhold);
            spkList.Add(SensorPir);
            spkList.Add(SensorPirHold);
            spkList.Add(SensorHelp);
            spkList.Add(SensorDoorWindow);
            spkList.Add(SensorSmoke);