合并

2025-01-20 14:36:00 +08:00 · 2025-01-20 14:36:00 +08:00 · 666f7cc4b9
commit 666f7cc4b9
parent 1a2fb2c92d
1 changed files with 0 additions and 4 deletions
--- a/src/pages/mediation-page/components/MediationRoom.vue
+++ b/src/pages/mediation-page/components/MediationRoom.vue
@ -367,10 +367,7 @@ export default {
      elapsedTime: 0,
      timerInterval: null,
      isRunning: false,
-<<<<<<< HEAD
      contactId: '',
-=======
-
      // 未接来电
      missedCallVisible: false,
      missedCallData: {
@ -379,7 +376,6 @@ export default {
      // 视频提醒
      videoReminderVisible: false,
      videoReminderData: {}
->>>>>>> 5d050e83e2826b0ae129388b597928682f1bcc9a
    };
  },
  computed: {