From ae9061e8e648af95393d96d6f5e59c434aed1558 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 21 十二月 2020 09:57:44 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath

---
 HDL_ON/Common/R.cs |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
old mode 100755
new mode 100644
index c1448e6..7e241c0
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -12,6 +12,8 @@
         public const int Retry = 402;
         public const int QRCodeIsInvalid = 401;
         public const int WellComBackHome = 400;
+        public const int FadeSpeed = 379;
+        public const int FadeTime = 378;
         public const int WholeZone = 377;
         public const int CannotEnterSpecialCharacters = 376;
         public const int GatewayOfflineCannotCreateScene = 375;
@@ -779,7 +781,14 @@
         /// 浣跨敤鏉冮檺
         /// </summary>
         public const int PermissionToUse = 9060;
-
+        /// <summary>
+        /// 浣跨敤鏉冮檺
+        /// </summary>
+        public const int PleaseTryToForgetPassword = 9061;
+        /// <summary>
+        /// 鏌ョ湅
+        /// </summary>
+        public const int LookOver = 9062;
 
         #region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
         /// <summary>

--
Gitblit v1.8.0