Merge remote-tracking branch 'origin/release0123' into wjc

wjc

2022-03-02 a154c3ce81601e3c202d3c5f4d0a8cefc5a7e8ae

 HDL_ON/Entity/Function/SecurityAlarm.cs

@@ -474,11 +474,11 @@
    {
        /// <summary>
        /// 控制目标类型
        /// 0:设备
        /// 1:场景
        /// 2:自动化
        /// 1:设备
        /// 2:场景
        /// 3:自动化
        /// </summary>
        public string target_type = "0";
        public string target_type = "1";
        /// <summary>
        /// 输出目标的sid
        /// </summary>
@@ -600,7 +600,7 @@
        public string StateText()
        {
            string text = "";
            if (target_type == "0")
            if (target_type == "1")
            {
                switch (spk)
                {
@@ -635,7 +635,7 @@
                        }
                        break;
                }
            }else if(target_type == "1")
            }else if(target_type == "2")
            {
                text = Language.StringByID(StringId.Open);
            }