From 9387e1416b3d50d7f8eb7612a7de794625cf3745 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 14 Jan 2022 16:08:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=BC=8F=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppGridManagement/AddFamily.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppGridManagement/AddFamily.vue b/src/apps/AppGridManagement/AddFamily.vue
index 926c25b3..c24d2767 100644
--- a/src/apps/AppGridManagement/AddFamily.vue
+++ b/src/apps/AppGridManagement/AddFamily.vue
@@ -23,7 +23,7 @@
                   <span class="user-tel">{{item.phone}}</span>
                  </div>
                 <div class="idCard">{{item.idNumber && item.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")}}</div>
-                <div class="address">{{item.householdAddress}}</div>
+                <div class="address">{{item.currentAreaName || '' + item.currentAddress}}</div>
               </div>
             </div>
           </div>

From 7304c9c6d5b0b11f57c1a8fea0abb04b53bfdc53 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 14 Jan 2022 16:12:35 +0800
Subject: [PATCH 2/2] bug

---
 src/apps/AppGridManagement/Organization.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/apps/AppGridManagement/Organization.vue b/src/apps/AppGridManagement/Organization.vue
index 6bf48c19..8622b91c 100644
--- a/src/apps/AppGridManagement/Organization.vue
+++ b/src/apps/AppGridManagement/Organization.vue
@@ -143,6 +143,7 @@ export default {
       width: 200px;
       height: 200px;
       margin-right: 32px;
+      border-radius: 50%;
     }
     .right{
       width: 100%;