提交merge1.3

openhis-ui-vue3/src/store/modules/user.js

@@ -19,8 +19,12 @@ const useUserStore = defineStore(
       roles: [],
       permissions: [],
       tenantId: '',
+<<<<<<< HEAD
       hospitalName:'',
       status: '' // 用户状态：0-启用(管理员), 1-禁用(普通人员)
+=======
+      hospitalName:''
+>>>>>>> v1.3
     }),
     actions: {
       // 登录
@@ -65,7 +69,10 @@ const useUserStore = defineStore(
             this.avatar = avatar
             this.hospitalName = res.optionJson.hospitalName
 
+<<<<<<< HEAD
             this.status = user.status // 保存用户状态
+=======
+>>>>>>> v1.3
             resolve(res)
           }).catch(error => {
             reject(error)