From b1feb33c00da0e3a5cbf77ed0ddd00154eb02b0b Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 14 Jan 2025 17:40:36 +0800
Subject: [PATCH] sc

---
 src/permission.js               | 2 +-
 src/views/Home/Salary/index.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index da85a4f..9192a5f 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,6 +1,6 @@
 import router from './router'
 import { isRelogin } from '@/config/axios/service'
-import { getAccessToken } from '@/utils/auth'
+import { getAccessToken, removeToken } from '@/utils/auth'
 import { useTitle } from '@/hooks/web/useTitle'
 import { useNProgress } from '@/hooks/web/useNProgress'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
diff --git a/src/views/Home/Salary/index.vue b/src/views/Home/Salary/index.vue
index 549d238..644617b 100644
--- a/src/views/Home/Salary/index.vue
+++ b/src/views/Home/Salary/index.vue
@@ -405,8 +405,8 @@ function importHistorySalary() {
 function spanMethod({ row, columnIndex }) {
   if (row.userSalaryGrantRespVOList && row.userSalaryGrantRespVOList.length > 0) {
     if (columnIndex === 0) {
-      return [1, 22]
-    } else if (columnIndex == 22 && row.id) {
+      return [1, 23]
+    } else if (columnIndex == 23 && row.id) {
       return [1, 1]
     } else {
       return [0, 0]