From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/GatewayResourse.cs | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/GatewayResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/GatewayResourse.cs
old mode 100755
new mode 100644
index b5aaf62..dc70725
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/GatewayResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/GatewayResourse.cs
@@ -1,22 +1,22 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-using ZigBee.Device;
-
-namespace Shared.Phone.UserCenter
-{
- /// <summary>
- /// 缃戝叧鐨凴esourse
- /// </summary>
- public class GatewayResourse
- {
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using ZigBee.Device;
+
+namespace Shared.Phone.UserCenter
+{
+ /// <summary>
+ /// 缃戝叧鐨凴esourse
+ /// </summary>
+ public class GatewayResourse
+ {
/// <summary>
/// 褰撳墠閫夋嫨鐨勭綉鍏矷D
/// </summary>
- public static string NowSelectGatewayId = string.Empty;
- /// <summary>
- /// APP鏈�鍚庨�夋嫨鐨勭綉鍏矷D(鎴栬杩欎釜鍙橀噺鏄澶囩鐞嗙晫闈笓鐢ㄧ殑)
- /// </summary>
- public static string AppOldSelectGatewayId = string.Empty;
- }
-}
+ public static string NowSelectGatewayId = string.Empty;
+ /// <summary>
+ /// APP鏈�鍚庨�夋嫨鐨勭綉鍏矷D(鎴栬杩欎釜鍙橀噺鏄澶囩鐞嗙晫闈笓鐢ㄧ殑)
+ /// </summary>
+ public static string AppOldSelectGatewayId = string.Empty;
+ }
+}
--
Gitblit v1.8.0