From e43478e41aafb7460d200059deca9a9a63ddbd9a Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 07 Aug 2021 18:12:42 +0800
Subject: [PATCH] 冲突

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

diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index c7f6f47..ca438a7 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -88,6 +88,8 @@
         viewBtn: true,
         selection: true,
         excelBtn: false,
+        addBtnText:"发布",
+        addTitle:"发布",
         menuWidth: 320,
         dialogClickModal: false,
         column: [

--
Gitblit v1.9.3