From e84df331a8ee600d369eeac4172b750db563926d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Sun, 09 Aug 2020 15:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUser.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUser.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUser.java
index f10954c..8380373 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUser.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUser.java
@@ -32,7 +32,11 @@
private String openId;
@TableLogic
private boolean isDel;
-
+ //是否默认密码
+ private Boolean defaultAuth;
+ //是否医院管理
+ @TableField(exist = false)
+ private boolean isHAdminUser;
private String tenantId;
@TableField(exist = false)
@@ -43,4 +47,8 @@
private String oldPassword;
@TableField(exist = false)
private String newPassword;
+ @TableField(exist = false)
+ private List<SysOrganization> organizations;
+ @TableField(exist = false)
+ private DoctorUserAll doctorUserAllVO;
}
--
Gitblit v1.8.0