From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
old mode 100755
new mode 100644
index 3c21f62..bde07d4
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -1100,7 +1100,7 @@
public MessageInfoPra()
{
- PageSetting.PageSize = 10;
+ PageSetting.PageSize = 50;
}
}
@@ -1222,6 +1222,10 @@
/// 鏄惁鍑哄姏璇︾粏Log 1 -> 鍑哄姏
/// </summary>
public int DetailedLog = 0;
+ /// <summary>
+ /// 鏄剧ず璁惧鍘嗗彶鐗堟湰 1 -> 鏄剧ず
+ /// </summary>
+ public int DeviceHistory = 0;
}
#endregion
}
--
Gitblit v1.8.0