Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppResidentActivitie/Detail.vue

@@ -14,6 +14,7 @@
           </div>
           <div class="right">
             <img :src="user.avatar" alt="" v-if="user.avatar" />
+            <img src="./user-img.png" alt="" v-else/>
 
             <span>{{ detail.contactPerson }}</span>
           </div>

src/apps/AppWalkask/walkObject.vue

@@ -52,7 +52,7 @@ export default {
   data() {
     return {
       DiyList: {},
-      userList: {},
+      userList: [],
       keyword: '',
       list: [
         {
@@ -91,6 +91,7 @@ export default {
     },
 
     selectUser(item) {
+      this.userList = []
       this.menuLevel3Name = item.menuLevel3Name
       this.appId = item.id
       this.$http.post(`/app/appapplicationinfo/list?appId=${item.id}&current=${this.current}&size=${99}`, { searchParam: this.keyword }).then((res) => {