Merge remote-tracking branch 'origin/dev' into dev

houruijun

2020-08-21 cdf8f1e691531a6fb1c3462d0ad70df7f68c0047

 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUser.java

@@ -33,7 +33,7 @@
    @TableLogic
    private boolean isDel;
    //是否默认密码
    private boolean defaultAuth;
    private Boolean defaultAuth;
    //是否医院管理
    @TableField(exist = false)
    private boolean isHAdminUser;