From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13  wjc2021-02-06

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/NormalFrameLayout.cs |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/NormalFrameLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/NormalFrameLayout.cs
old mode 100755
new mode 100644
index 4488827..3903360
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/NormalFrameLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/NormalFrameLayout.cs
@@ -1,14 +1,14 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Shared.Phone.UserCenter
-{
-    /// <summary>
-    /// 鏅�氱殑FrameLayout
-    /// </summary>
-    public class NormalFrameLayout : FrameLayoutBase
-    {
-        //鐩墠娌℃湁浠�涔堢壒娈婄殑鍔熻兘
-    }
-}
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter
+{
+    /// <summary>
+    /// 鏅�氱殑FrameLayout
+    /// </summary>
+    public class NormalFrameLayout : FrameLayoutBase
+    {
+        //鐩墠娌℃湁浠�涔堢壒娈婄殑鍔熻兘
+    }
+}

--
Gitblit v1.8.0