From eb51679c618d5027070fbd6f3c0519f0f17e7d7d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:07:53 +0800
Subject: [PATCH] Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL

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

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index e1defaf..18ab3a8 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -476,7 +476,47 @@
         /// 鍐嶆杈撳叆鏂板瘑鐮�
         /// </summary>
         public const int NewPasswordAgain = 9011;
-
+        /// <summary>
+        /// 鍚屾剰
+        /// </summary>
+        public const int Agree = 9012;
+        /// <summary>
+        /// 鐢ㄦ埛鍗忚
+        /// </summary>
+        public const int UserAgreement = 9013;
+        /// <summary>
+        /// 闅愮鏀跨瓥
+        /// </summary>
+        public const int PrivacyPolicy = 9014;
+        /// <summary>
+        /// 鍜�
+        /// </summary>
+        public const int And = 9015;
+        /// <summary>
+        /// 璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
+        /// </summary>
+        public const int PleaseReadAndAgreePrivacyPolicyMsg = 9016;
+        /// <summary>
+        /// 纭閫�鍑虹櫥褰曪紵
+        /// </summary>
+        public const int IfConfirmLogout = 9017;
+        /// <summary>
+        /// 閫夋嫨鍥藉鎴栧尯鍩�
+        /// </summary>
+        public const int SelectCountryOrRegion = 9018;
+        /// <summary>
+        /// 鏇存柊
+        /// </summary>
+        public const int Update = 9019;
+        /// <summary>
+        /// 蹇界暐
+        /// </summary>
+        public const int Ignore = 9020;
+        /// <summary>
+        /// 鎴戠殑浜岀淮鐮�
+        /// </summary>
+        public const int MyQRCode = 9021;
+       
 
         #region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
         /// <summary>

--
Gitblit v1.8.0