From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs | 148 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 110 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
index 243b8ba..2c1680d 100644
--- 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
{
@@ -12,32 +13,32 @@
public ResidenceMemberInfo()
{
}
- public string Account = "";
+ //public string Account = "";
- public string UserName = "";
+ //public string UserName = "";
- public string SubAccountDistributedMark = "";
+ //public string SubAccountDistributedMark = "";
- public string DistributedMark = "";
+ //public string DistributedMark = "";
- public string Nickname = "";
+ //public string Nickname = "";
- public int AccountType = 0;
- /// <summary>
- /// <!--姝ゆ垚鍛樺笎鍙锋槸鍚﹀叿鏈夎繙绋嬫帶鍒舵潈闄�-->
- /// </summary>
- public bool IsAllowRemoteCtrl = false;
- /// <summary>
- /// 鏄惁鍏佽瀛愯处鍙峰垱寤哄満鏅�
- /// </summary>
- public bool IsAllowCreateScene = false;
+ //public int AccountType = 0;
+ ///// <summary>
+ ///// <!--姝ゆ垚鍛樺笎鍙锋槸鍚﹀叿鏈夎繙绋嬫帶鍒舵潈闄�-->
+ ///// </summary>
+ //public bool IsAllowRemoteCtrl = false;
+ ///// <summary>
+ ///// 鏄惁鍏佽瀛愯处鍙峰垱寤哄満鏅�
+ ///// </summary>
+ //public bool IsAllowCreateScene = false;
public string headImagePagePath = "LoginIcon/2.png";
/// <summary>
/// 瀛愯处鍙疯幏寰楃殑褰撳墠浣忓畢鐨勫姛鑳芥暟鎹�
/// </summary>
- public List<ShareData> CurResidenceShareDate = new List<ShareData>();
+ public List<ShareData> CurResidenceShareData = new List<ShareData>();
/// <summary>
///
@@ -64,9 +65,17 @@
/// </summary>
public string childAccountType;
/// <summary>
+ /// 鍖哄煙鏈嶅姟鍣�
+ /// </summary>
+ public string childAccountRegionUrl;
+ /// <summary>
/// 鏄惁鍏佽杩滅▼鎺у埗
/// </summary>
public bool isRemoteControl;
+ /// <summary>
+ /// 鏄惁鍒涘缓鍦烘櫙
+ /// </summary>
+ public bool isAllowCreateScene;
/// <summary>
/// 鏄电О1
/// </summary>
@@ -75,31 +84,94 @@
///
/// </summary>
public string createTime;
+ /// <summary>
+ /// 鐢ㄦ埛鍚嶅瓧
+ /// </summary>
+ public string memberName = "";
+ /// <summary>
+ ///
+ /// </summary>
+ public string childAccountEmail;
+ /// <summary>
+ ///
+ /// </summary>
+ public string childAccountPhone;
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚
+ /// </summary>
+ public string memberHeadIcon;
+ /// <summary>
+ /// 鐢ㄦ埛璐﹀彿
+ /// 浼樺厛鏄剧ず鎵嬫満鍙凤紝濡傛灉鎵嬫満鍙蜂负绌哄垯鏄剧ず閭鍦板潃
+ /// </summary>
+ public string Account
+ {
+ get
+ {
+ if (!string.IsNullOrEmpty(childAccountPhone))
+ {
+ return childAccountPhone;
+ }
+ else
+ {
+ if (!string.IsNullOrEmpty(childAccountEmail))
+ {
+ return childAccountEmail;
+ }
+ else
+ {
+ return "";
+ }
+ }
+ }
+ }
}
- 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;
+
+
+ //}
}
--
Gitblit v1.8.0