HDL_ON/Common/R.cs
@@ -1201,6 +1201,7 @@ /// 请重新尝试 /// </summary> public const int PleaseTryAgain = 1158; <<<<<<< HEAD /// <summary> /// 管理员权限转移 /// </summary> @@ -1237,6 +1238,9 @@ /// 迁移成功,您的权限将变为普通成员 /// </summary> public const int TransferreSuccessMsg1 = 1167; ======= >>>>>>> parent of 3861152e (Merge branch 'tzy2' into newBranch1) public const int keshiduijiang = 4000; public const int tonghuajilu = 4001;