Merge remote-tracking branch 'origin/wjc' into feature/v2.7_迭代

wxr

2024-10-14 b847c06d8617efb2cbbad6f11b0344b779138e92

 HDL_ON/Entity/Function/SecurityAlarm.cs

@@ -336,6 +336,7 @@
                    }
                    break;
                case SPK.SensorPir:
                case SPK.SensorPirHold:
                    if (inputValue == "true")
                    {
                        text += Language.StringByID(StringId.youren) + " ";
@@ -394,6 +395,7 @@
                    }
                    break;
                case SPK.SensorPir:
                case SPK.SensorPirHold:
                    foreach (var con in condition)
                    {
                        if (con.value == "true")