Merge branch 'wxr-2.2' into Dev-Branch

wxr

2023-10-20 4e4f9c3ee4ff6d05d5a431626901fbf43eb368a9

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

@@ -2292,7 +2292,7 @@
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            if (value == "open")
                            if (value == "on" || value == "open")
                            {
                                button1.Text = Language.StringByID(StringId.onLogic);
                            }