From 3861152ee23bfc0724579299b6be188f5f16b192 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:35:33 +0800
Subject: [PATCH] Merge branch 'tzy2' into newBranch1
---
HDL_ON/Common/R.cs | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 0a0eb53..3e8ecd9 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,6 +5,18 @@
public static class StringId
{
/// <summary>
+ /// 椋庨噺
+ /// </summary>
+ public const int AirVolume = 479;
+ /// <summary>
+ /// 鎽嗗姩
+ /// </summary>
+ public const int Pattern = 478;
+ /// <summary>
+ /// 鎽嗗姩
+ /// </summary>
+ public const int HeadSwinging = 477;
+ /// <summary>
/// 娣诲姞浣忓畢
/// </summary>
public const int AddResidence = 476;
@@ -1188,8 +1200,43 @@
/// <summary>
/// 璇烽噸鏂板皾璇�
/// </summary>
- public const int PleaseTryAgain = 1158;
-
+ public const int PleaseTryAgain = 1158;
+ /// <summary>
+ /// 绠＄悊鍛樻潈闄愯浆绉�
+ /// </summary>
+ public const int AdminAuthorityTransfer = 1159;
+ /// <summary>
+ /// 鎮ㄥ皢杞Щ鎮ㄧ殑绠＄悊鍛樻潈闄愮粰鍏朵粬鎴愬憳
+ /// </summary>
+ public const int AdminAuthorityTransferMag1 = 1160;
+ /// <summary>
+ /// 1.璇ヤ綇瀹呮偍鐨勭鐞嗗憳鏁版嵁锛堜簯绔暟鎹級灏嗗叏閮ㄨ浆绉荤粰鏂扮殑绠＄悊鍛榹0}2.鎮ㄧ殑鏁版嵁灏嗕細涓庣洰鏍囨垚鍛樹簰鎹紝鎮ㄧ殑鏉冮檺灏嗗彉鏇翠负鐩爣鎴愬憳鐨勬潈闄�
+ /// </summary>
+ public const int AdminAuthorityTransferMag2 = 1161;
+ /// <summary>
+ /// 纭杞Щ
+ /// </summary>
+ public const int ConfirmTransfer2 = 1162;
+ /// <summary>
+ /// 妫�娴嬩笉鍒板彲渚涢�夋嫨鐨勬垚鍛�
+ /// </summary>
+ public const int NotHadMemberToSelect = 1163;
+ /// <summary>
+ /// 纭杞Щ{0}鐨勭鐞嗗憳鏉冮檺缁欒处鍙穥1}
+ /// </summary>
+ public const int TransferreConfirmMsg3 = 1164;
+ /// <summary>
+ /// 杩佺Щ鎴愬姛
+ /// </summary>
+ public const int TransferreSuccess1 = 1165;
+ /// <summary>
+ /// 杩佺Щ澶辫触
+ /// </summary>
+ public const int TransferreFail1 = 1166;
+ /// <summary>
+ /// 杩佺Щ鎴愬姛锛屾偍鐨勬潈闄愬皢鍙樹负鏅�氭垚鍛�
+ /// </summary>
+ public const int TransferreSuccessMsg1 = 1167;
public const int keshiduijiang = 4000;
public const int tonghuajilu = 4001;
--
Gitblit v1.8.0