From a4d525d08da7b6fb985b0069c539c11b06306a9b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 16:28:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
index 422459f..fa0a6e7 100644
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -176,7 +176,7 @@
/// <summary>
///鏆傛椂榛樿
/// </summary>
- public string Nmae = string.Empty;
+ public string UserName = string.Empty;
/// <summary>
/// 璐︽埛鐧诲綍鎴愬姛鐨勮处鎴风被鍨�
/// </summary>
@@ -198,7 +198,6 @@
}
}
- public string Name = string.Empty;
/// <summary>
/// 褰撳墠鐧诲綍鐨勫笎鍙�
/// </summary>
--
Gitblit v1.8.0