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

# Conflicts: # src/apps/AppMeetingNotice/belongToMe.vue # src/apps/AppMeetingNotice/detail.vue
2021-12-13 13:46:57 +08:00
parent 0e6f57265a a696aab44a
commit 24b96ec35c
7 changed files with 657 additions and 672 deletions
--- a/src/apps/AppMeetingNotice/addMeeting.vue
+++ b/src/apps/AppMeetingNotice/addMeeting.vue
@@ -166,7 +166,7 @@ export default {
      }).then(res => {
        this.change(res?.userList || [])
        this.clickedUserSelect = false
-      }).catch(()=>{
+      }).catch(() => {
        this.clickedUserSelect = false
      })
    },