Merge branch 'master' into test

shuishen

2025-04-29 ef9ad4a0ae1c8229a9fbd503fba655e81ce07770

 src/store/modules/user.js

@@ -236,7 +236,6 @@
            commit('CLEAR_LOCK');
            removeToken();
            removeRefreshToken();
            removeToken();
            resolve();
          })
          .catch(error => {