From aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 21:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs | 100 +++++++++++++++++++++++++++----------------------
1 files changed, 55 insertions(+), 45 deletions(-)
diff --git a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
old mode 100644
new mode 100755
index f049bc2..2c1680d
--- a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
+++ b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.DAL.Server;
namespace HDL_ON.Entity
{
@@ -37,7 +38,7 @@
/// <summary>
/// 瀛愯处鍙疯幏寰楃殑褰撳墠浣忓畢鐨勫姛鑳芥暟鎹�
/// </summary>
- public List<ShareData> CurResidenceShareDate = new List<ShareData>();
+ public List<ShareData> CurResidenceShareData = new List<ShareData>();
/// <summary>
///
@@ -64,6 +65,10 @@
/// </summary>
public string childAccountType;
/// <summary>
+ /// 鍖哄煙鏈嶅姟鍣�
+ /// </summary>
+ public string childAccountRegionUrl;
+ /// <summary>
/// 鏄惁鍏佽杩滅▼鎺у埗
/// </summary>
public bool isRemoteControl;
@@ -82,7 +87,7 @@
/// <summary>
/// 鐢ㄦ埛鍚嶅瓧
/// </summary>
- public string UserName = "";
+ public string memberName = "";
/// <summary>
///
/// </summary>
@@ -91,6 +96,10 @@
///
/// </summary>
public string childAccountPhone;
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚
+ /// </summary>
+ public string memberHeadIcon;
/// <summary>
/// 鐢ㄦ埛璐﹀彿
/// 浼樺厛鏄剧ず鎵嬫満鍙凤紝濡傛灉鎵嬫満鍙蜂负绌哄垯鏄剧ず閭鍦板潃
@@ -119,49 +128,50 @@
}
}
- public class ShareData
- {
- ///// <summary>
- ///// 澶囦唤鍚嶇О
- ///// </summary>
- //public string ShareName = "";
- ///// <summary>
- ///// 澶囦唤鐨勬暟鎹甀D
- ///// </summary>
- //public string DistributedMark = "";
- ///// <summary>
- ///// 澶囦唤鎵�灞炵殑浣忓畢ID
- ///// </summary>
- //public string HouseDistributedMark = "";
- ///// <summary>
- ///// 瀛愯处鍙稩D
- ///// </summary>
- //public string SubAccountDistributedMark = "";
- /// <summary>
- /// 鍔熻兘鏁版嵁
- /// </summary>
- public byte[] ShareDataBytes;
+ //public class ShareData
+ //{
+ // ///// <summary>
+ // ///// 澶囦唤鍚嶇О
+ // ///// </summary>
+ // //public string ShareName = "";
+ // ///// <summary>
+ // ///// 澶囦唤鐨勬暟鎹甀D
+ // ///// </summary>
+ // //public string DistributedMark = "";
+ // ///// <summary>
+ // ///// 澶囦唤鎵�灞炵殑浣忓畢ID
+ // ///// </summary>
+ // //public string HouseDistributedMark = "";
+ // ///// <summary>
+ // ///// 瀛愯处鍙稩D
+ // ///// </summary>
+ // //public string SubAccountDistributedMark = "";
+ // ///// <summary>
+ // ///// 鍔熻兘鏁版嵁
+ // ///// </summary>
+ // //public byte[] ShareDataBytes;
- /// <summary>
- /// 涓婚敭ID
- /// </summary>
- public string id;
- /// <summary>
- /// 浣忓畢ID
- /// </summary>
- public string homeId;
- /// <summary>
- /// 瀛愯处鍙稩D
- /// </summary>
- public string childAccountId;
- /// <summary>
- /// 鏂囦欢鍚�
- /// </summary>
- public string fileName;
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public string createTime;
+ // ///// <summary>
+ // ///// 涓婚敭ID
+ // ///// </summary>
+ // //public string id;
+ // ///// <summary>
+ // ///// 浣忓畢ID
+ // ///// </summary>
+ // //public string homeId;
+ // ///// <summary>
+ // ///// 瀛愯处鍙稩D
+ // ///// </summary>
+ // //public string childAccountId;
+ // ///// <summary>
+ // ///// 鏂囦欢鍚�
+ // ///// </summary>
+ // //public string fileName;
+ // ///// <summary>
+ // ///// 鍒涘缓鏃堕棿
+ // ///// </summary>
+ // //public string createTime;
- }
+
+ //}
}
--
Gitblit v1.8.0