Merge branch 'master' of codeup.aliyun.com:61c0318acd8b75daa5a125f7/medical/openhis

openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java

@@ -39,6 +39,7 @@ public class HisBaseEntity implements Serializable {
     private Date updateTime;
 
     /** 租户ID */
+    @TableField(fill = FieldFill.INSERT)
     private Integer tenantId;
 
     /** 删除标识 */

openhis-server/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java

@@ -3,6 +3,7 @@ package com.core.common.core.domain.model;
 import java.util.Collection;
 import java.util.Set;
 
+import lombok.Data;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
@@ -14,6 +15,7 @@ import com.core.common.core.domain.entity.SysUser;
  * 
  * @author system
  */
+@Data
 public class LoginUser implements UserDetails {
     private static final long serialVersionUID = 1L;
 
@@ -67,6 +69,9 @@ public class LoginUser implements UserDetails {
      */
     private Set<String> permissions;
 
+    /** 租户ID */
+    private Integer tenantId;
+
     /**
      * 用户信息
      */