From af0aaf0fe19dc69369ee2f7e5ca001c24353a22e Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 16 Feb 2022 17:22:52 +0800
Subject: [PATCH] 冲突

---
 src/views/talk/talk.vue |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/views/talk/talk.vue b/src/views/talk/talk.vue
index d4c70fc..fc66e3e 100644
--- a/src/views/talk/talk.vue
+++ b/src/views/talk/talk.vue
@@ -87,6 +87,7 @@
         index: true,
         viewBtn: true,
         selection: true,
+        menu:false,
         dialogClickModal: false,
         ...this.$store.state.control.clearOtherBut,
         menu: false,

--
Gitblit v1.9.3