From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/GatewayBackupEnum.cs | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/GatewayBackupEnum.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/GatewayBackupEnum.cs
index 5228f2b..c80de9c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/GatewayBackupEnum.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/GatewayBackupEnum.cs
@@ -34,20 +34,32 @@
/// </summary>
A骞叉帴鐐硅妭鑳芥ā寮� = 6,
/// <summary>
- /// 骞叉帴鐐圭鏈夊睘鎬�
+ /// 骞叉帴鐐圭涓夌骇鍒鏈夊睘鎬�
/// </summary>
- A骞叉帴鐐圭鏈夊睘鎬� = 7,
+ A骞叉帴鐐圭涓夌骇鍒鏈夊睘鎬� = 7,
+ /// <summary>
+ /// 绐楀笜涓婁笅闄愪綅(杩欎釜涓滆タ闇�瑕佸湪绗竴)
+ /// </summary>
+ A绐楀笜涓婁笅闄愪綅 = 8,
/// <summary>
/// 绐楀笜鎵嬫媺鎺у埗
/// </summary>
- A绐楀笜鎵嬫媺鎺у埗 = 8,
- /// <summary>
- /// 绐楀笜涓婁笅闄愪綅
- /// </summary>
- A绐楀笜涓婁笅闄愪綅 = 9,
+ A绐楀笜鎵嬫媺鎺у埗 = 9,
/// <summary>
/// 绐楀笜鏂瑰悜
/// </summary>
A绐楀笜鏂瑰悜 = 10,
+ /// <summary>
+ /// 绌鸿皟鑷畾涔夋ā寮�
+ /// </summary>
+ A绌鸿皟鑷畾涔夋ā寮� = 11,
+ /// <summary>
+ /// 绠�绾﹂潰鏉块渿鍔ㄥ姛鑳�
+ /// </summary>
+ A绠�绾﹂潰鏉块渿鍔ㄥ姛鑳� = 12,
+ /// <summary>
+ /// 绌鸿皟鎽嗛鍔熻兘
+ /// </summary>
+ A绌鸿皟鎽嗛鍔熻兘 = 13,
}
}
--
Gitblit v1.8.0