Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2022-06-07 3afa6b622356b974a42ff29b1e4f0e35d2bf68f0

 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs

@@ -140,7 +140,7 @@
                    }
                    else
                    {
                        btnAlarmStatus.TextID = StringId.Normal;
                        btnAlarmStatus.TextID = StringId.zhengchang;
                        btnAlarmStatus.TextColor = CSS_Color.MainColor;
                    }