From fefef715d50814227983271ff9694bf4c440dd3b Mon Sep 17 00:00:00 2001
From: fz <f1876506442@163.com>
Date: Wed, 29 Nov 2023 22:58:50 +0800
Subject: [PATCH] =?UTF-8?q?1129=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/officialSeal/components/uploadSeal.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/views/officialSeal/components/uploadSeal.vue b/src/views/officialSeal/components/uploadSeal.vue
index 53d1786..56e2c15 100644
--- a/src/views/officialSeal/components/uploadSeal.vue
+++ b/src/views/officialSeal/components/uploadSeal.vue
@@ -87,13 +87,8 @@ export default {
         },
         handleSuccess(response) {
             if (response.code == 200) {
-<<<<<<< HEAD
                 this.$message.success('上传成功');
                 this.cancel()
-=======
-                this.$message.success('上传成功')
-                this.$emit("cancelUpload");
->>>>>>> bc4691123ec628dfcb0e8da135f81da669366537
             } else {
                 this.$message.error(response.msg);
             }