提交merge1.3

2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
--- a/openhis-ui-vue3/src/store/modules/user.js
+++ b/openhis-ui-vue3/src/store/modules/user.js
@@ -19,12 +19,7 @@ const useUserStore = defineStore(
      roles: [],
      permissions: [],
      tenantId: '',
-<<<<<<< HEAD
-      hospitalName:'',
-      status: '' // 用户状态：0-启用(管理员), 1-禁用(普通人员)
-=======
      hospitalName:''
->>>>>>> v1.3
    }),
    actions: {
      // 登录
@@ -69,10 +64,6 @@ const useUserStore = defineStore(
            this.avatar = avatar
            this.hospitalName = res.optionJson.hospitalName

-<<<<<<< HEAD
-            this.status = user.status // 保存用户状态
-=======
->>>>>>> v1.3
            resolve(res)
          }).catch(error => {
            reject(error)