From 5ea6aa8ea047d4d7b6137fa86c03109aeb1b67ff Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 18:03:18 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath

---
 HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
index d07795c..2c1680d 100755
--- a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
+++ b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
@@ -38,7 +38,7 @@
         /// <summary>
         /// 瀛愯处鍙疯幏寰楃殑褰撳墠浣忓畢鐨勫姛鑳芥暟鎹�
         /// </summary>
-        public List<ShareData> CurResidenceShareDate = new List<ShareData>();
+        public List<ShareData> CurResidenceShareData = new List<ShareData>();
 
         /// <summary>
         /// 
@@ -87,7 +87,7 @@
         /// <summary>
         /// 鐢ㄦ埛鍚嶅瓧
         /// </summary>
-        public string UserName = "";
+        public string memberName = "";
         /// <summary>
         /// 
         /// </summary>

--
Gitblit v1.8.0