From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict

---
 src/views/goalManagement/Goalsummary/index.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/goalManagement/Goalsummary/index.vue b/src/views/goalManagement/Goalsummary/index.vue
index 4947ed0..bd0b742 100644
--- a/src/views/goalManagement/Goalsummary/index.vue
+++ b/src/views/goalManagement/Goalsummary/index.vue
@@ -69,7 +69,7 @@
 import { Plus, Delete, Upload, Download, Refresh, View } from '@element-plus/icons-vue';
 import { goalManagementApi } from '/@/api/goalManagement';
 
-// import * as XLSX from 'xlsx';
+import * as XLSX from 'xlsx';
 
 export default defineComponent({
 	components: { ElButton, ElInput },

--
Gitblit v1.9.2