Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

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>

src/apps/AppGridManagement/Organization.vue

@@ -143,6 +143,7 @@ export default {
       width: 200px;
       height: 200px;
       margin-right: 32px;
+      border-radius: 50%;
     }
     .right{
       width: 100%;