From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改
---
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 f415d7c..6f4facd 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,7 +4,10 @@
{
public static class StringId
{
-
+ /// <summary>
+ /// 瑙掑害
+ /// </summary>
+ public const int Angle = 544;
/// <summary>
/// 鑾峰彇鏇村
/// </summary>
@@ -50,6 +53,10 @@
/// 璁垮浜岀淮鐮佺粨鏉熸椂闂�
/// </summary>
public const int VisitorEndTime = 2550;
+ /// <summary>
+ /// 鍔ㄦ�佸瘑鐮佸凡澶辨晥
+ /// </summary>
+ public const int TemporaryPasswordInvalid = 2551;
/// <summary>
/// 璁垮浜岀淮鐮佸紑濮嬫椂闂�
/// </summary>
@@ -107,6 +114,10 @@
/// </summary>
public const int VisitorTip = 2536;
/// <summary>
+ /// 璁垮閭�璇疯褰�
+ /// </summary>
+ public const int VisitorInvitationRecord = 2532;
+ /// <summary>
/// 璁垮璁板綍
/// </summary>
public const int VisitorRecord = 2535;
--
Gitblit v1.8.0