From 5851291c78b2cb5532e6938c77b5f51eb06a6ad2 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 21 十二月 2020 19:41:07 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath

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

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index a77417b..a33898a 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -734,7 +734,7 @@
         /// </summary>
         public const int LogWithAccountAndPassword = 9048;
         /// <summary>
-        /// 瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
+        /// 瀵嗙爜閿欒娆℃暟杩囧锛岃处鍙疯閿佸畾锛�
         /// </summary>
         public const int AccountLoginLock = 9049;
         /// <summary>
@@ -785,7 +785,14 @@
         /// 浣跨敤鏉冮檺
         /// </summary>
         public const int PleaseTryToForgetPassword = 9061;
-
+        /// <summary>
+        /// 鏌ョ湅
+        /// </summary>
+        public const int LookOver = 9062;
+        /// <summary>
+        /// 杩樻湁{0}娆℃満浼氥��
+        /// </summary>
+        public const int AFewMoreChances = 9063;
 
         #region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
         /// <summary>

--
Gitblit v1.8.0