Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

shuishen

2026-01-17 86c2d61ba9d33f1886cfc904dcaf17f033e4c80a

 applications/task-work-order/src/store/modules/user.js

@@ -280,7 +280,7 @@
        })
      }
      return new Promise(resolve => {
        getRoutes({tenantId,sysType: 5}).then(res => {
        getRoutes({tenantId,sysType: 6}).then(res => {
          const data = res.data.data;
          let menu = deepClone(data);
          if (!res.data?.data?.length){
@@ -299,7 +299,7 @@
    },
    GetButtons({ commit }) {
      return new Promise(resolve => {
        getButtons({sysType: 5}).then(res => {
        getButtons({sysType: 6}).then(res => {
          const data = res.data.data;
          commit('SET_PERMISSION', data);
          resolve();