From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
index 064fea3..5ee5159 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
@@ -34,11 +34,19 @@
/// <summary>
/// 璐﹀彿鐨勮缃俊鎭�
/// </summary>
- public static AccountOption Option = new AccountOption();
+ public static AccountOptionClass AccountOption = new AccountOptionClass();
+ /// <summary>
+ /// 浣忓畢鐨勮缃俊鎭�
+ /// </summary>
+ public static ResidenceOptionClass ResidenceOption = new ResidenceOptionClass();
/// <summary>
/// 闅愬尶閰嶇疆
/// </summary>
- public static HideOptionInfo HideOption = new HideOptionInfo();
+ public static HideOptionInfo HideOption = new HideOptionInfo();
+ /// <summary>
+ /// 娴嬭瘯鑳藉惁骞挎挱寰楀埌缃戝叧,閫氬父鎯呭喌涓嬩负null
+ /// </summary>
+ public static Dictionary<string, ZbGateway> DicReceiveGatewayTest = null;
/// <summary>
/// 鏂囦欢鍔犲瘑绉橀挜
/// </summary>
--
Gitblit v1.8.0