From da22725d616af0f3081670c76195eaf57794bc29 Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期三, 18 五月 2022 16:03:33 +0800 Subject: [PATCH] Merge branch 'dev-CQY' into dev 1.调整全视通与自研的逻辑 2.增加获取可视对讲第三方账号接口 --- HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs index fe290a9..92fea27 100644 --- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs +++ b/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; } -- Gitblit v1.8.0