chore: 🔨 合并冲突解决

src/views/system/dept/index.vue

@@ -31,7 +31,7 @@
           v-hasPerm="['sys:dept:add']"
           type="success"
           icon="plus"
-          @click="handleOpenDialog(0, undefined)"
+          @click="handleOpenDialog()"
         >
           新增
         </el-button>

src/views/system/notice/components/NoticeDetail.vue

@@ -32,12 +32,8 @@
       </el-descriptions-item>
       <el-descriptions-item label="发布状态：">
         <el-tag v-if="notice.publishStatus == 0" type="info">未发布</el-tag>
-        <el-tag v-else-if="notice.publishStatus == 1" type="success">
-          已发布
-        </el-tag>
-        <el-tag v-else-if="notice.publishStatus == -1" type="warning">
-          已撤回
-        </el-tag>
+        <el-tag v-else-if="notice.publishStatus == 1" type="success">已发布</el-tag>
+        <el-tag v-else-if="notice.publishStatus == -1" type="warning">已撤回</el-tag>
       </el-descriptions-item>
       <el-descriptions-item label="发布人：">
         {{ notice.publisherName }}

src/views/system/user/components/UserImport.vue

@@ -95,9 +95,7 @@ const handleFileExceed = () => {
 const handleDownloadTemplate = () => {
   UserAPI.downloadTemplate().then((response: any) => {
     const fileData = response.data;
-    const fileName = decodeURI(
-      response.headers["content-disposition"].split(";")[1].split("=")[1]
-    );
+    const fileName = decodeURI(response.headers["content-disposition"].split(";")[1].split("=")[1]);
     const fileType =
       "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8";