From 55bd5c4ccb56cbd3c10e6b170aaab20d7023c139 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 14 十二月 2020 10:44:41 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/Common/R.cs | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index bd55f60..62a3a56 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,10 @@
{
public static class StringId
{
+ public const int ResidenceDeletedSwitchToAnotherResidence = 374;
+ public const int AddFloorFail = 373;
+ public const int UnableToCreateScenarioPleaseBindGateway = 372;
+ public const int FunctionCannotBeUsedPleaseBindGateway = 371;
public const int TobeFamily = 370;
public const int AddNewResidence = 369;
public const int WelcomeToOnPlus = 368;
@@ -701,7 +705,14 @@
/// 鎮ㄧ殑瀵嗙爜宸茬粡淇敼鐢熸晥锛岃閲嶆柊鐧诲綍
/// </summary>
public const int YourPasswordHasBeenChanged = 9047;
-
+ /// <summary>
+ /// 浣跨敤璐﹀彿瀵嗙爜鐧诲綍
+ /// </summary>
+ public const int LogWithAccountAndPassword = 9048;
+ /// <summary>
+ /// 瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
+ /// </summary>
+ public const int AccountLoginLock = 9049;
#region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
/// <summary>
--
Gitblit v1.8.0