diff --git a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/CasUser.java b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/CasUser.java index 54b8d203..18773d90 100644 --- a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/CasUser.java +++ b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/CasUser.java @@ -54,22 +54,22 @@ public class CasUser extends User { private LocalDateTime loginTime; /** 创建ID */ - private String createById; + private String $createById; /** 创建人 */ - private String createByName; + private String $createByName; /** 创建时间 */ - private LocalDateTime createTime; + private LocalDateTime $createTime; /** 更新id */ - private String updateById; + private String $updateById; /** 更新者 */ - private String updateByName; + private String $updateByName; /** 更新时间 */ - private LocalDateTime updateTime; + private LocalDateTime $updateTime; /** 备注 */ private String remarks; @@ -125,12 +125,12 @@ public class CasUser extends User { this.avatar = avatar; this.loginIp = loginIp; this.loginTime = loginTime; - this.createById = createById; - this.createByName = createByName; - this.createTime = createTime; - this.updateById = updateById; - this.updateByName = updateByName; - this.updateTime = updateTime; + this.$createById = createById; + this.$createByName = createByName; + this.$createTime = createTime; + this.$updateById = updateById; + this.$updateByName = updateByName; + this.$updateTime = updateTime; this.remarks = remarks; this.roleId = roleId; this.tenantId = tenantId; diff --git a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/KiccUser.java b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/KiccUser.java index f08d02d4..c2028958 100644 --- a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/KiccUser.java +++ b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/KiccUser.java @@ -13,6 +13,7 @@ import lombok.experimental.Accessors; import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.authority.SimpleGrantedAuthority; +import java.time.LocalDateTime; import java.util.List; /** @@ -66,6 +67,24 @@ public class KiccUser extends CasUser { @ApiModelProperty("多租户ID集合") private String[] tenantIds; + /** 创建ID */ + private String createById; + + /** 创建人 */ + private String createByName; + + /** 创建时间 */ + private LocalDateTime createTime; + + /** 更新id */ + private String updateById; + + /** 更新者 */ + private String updateByName; + + /** 更新时间 */ + private LocalDateTime updateTime; + public KiccUser() { super(SecurityConstants.MOCK_USERNAME, SecurityConstants.MOCK_PASSWORD, AuthorityUtils.createAuthorityList()); }