From 4ff43d632e4b08c115f69a21f4c867e4dafdfc13 Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Thu, 21 Apr 2022 15:07:22 +0800
Subject: [PATCH 1/2] BUG 29236

---
 packages/meta/AppResident/residentDetail.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/meta/AppResident/residentDetail.vue b/packages/meta/AppResident/residentDetail.vue
index 913a2396..3e7ced0c 100644
--- a/packages/meta/AppResident/residentDetail.vue
+++ b/packages/meta/AppResident/residentDetail.vue
@@ -199,10 +199,10 @@
                   </ai-table>
                 </div>
               </ai-card>
-              <tags-manage v-if="currentTab=='0'" v-bind="$props" :resident-id="baseInfo.id"/>
+              <tags-manage v-if="currentTab=='0'&&baseInfo.id" v-bind="$props" :resident-id="baseInfo.id"/>
             </el-tab-pane>
             <el-tab-pane label="资产信息" lazy>
-              <personal-assets v-if="currentTab==1" :resident-id="baseInfo.id" v-bind="$props"/>
+              <personal-assets v-if="currentTab==1&&baseInfo.id" :resident-id="baseInfo.id" v-bind="$props"/>
             </el-tab-pane>
             <el-tab-pane label="特殊人群" lazy v-if="hasSpecial">
               <ai-card v-for="(item, index) in baseInfo.tsrqInfos" :key="index" :title="item.applicationName">

From 283fb8767ddf801345e1d2c09278ed0ae2f3e4eb Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Thu, 21 Apr 2022 15:08:31 +0800
Subject: [PATCH 2/2] BUG 29229

---
 project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue b/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue
index 364ab8b5..ad7353fb 100644
--- a/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue
+++ b/project/sanjianxi/apps/AppHelpByNeighbours/hbnList.vue
@@ -40,7 +40,7 @@
           <ai-select v-model="form.residentId" :selectList="residents" placeholder="请选择四邻信息"/>
         </el-form-item>
         <el-form-item label="日期" prop="linksageDate">
-          <el-date-picker v-model="form.linksageDate" clearable placeholder="日期"/>
+          <el-date-picker v-model="form.linksageDate" clearable placeholder="日期" value-format="yyyy-MM-dd"/>
         </el-form-item>
         <el-form-item label="描述" prop="description">
           <el-input type="textarea" v-model="form.description" rows="5" maxlength="200" show-word-limit/>