diff --git a/logging/src/main/java/com/storeroom/domain/LoginLog.java b/logging/src/main/java/com/storeroom/domain/LoginLog.java index baffc7c..84041f5 100644 --- a/logging/src/main/java/com/storeroom/domain/LoginLog.java +++ b/logging/src/main/java/com/storeroom/domain/LoginLog.java @@ -37,7 +37,7 @@ public class LoginLog extends BaseEntity implements Serializable { @Column(name = "det") private String det; - @Column(name = "requestIp") + @Column(name = "request_ip") private String requestIp; @Override @@ -52,4 +52,5 @@ public class LoginLog extends BaseEntity implements Serializable { public int hashCode() { return Objects.hash(id, account, username, role, det, requestIp); } + } diff --git a/system/src/main/java/com/storeroom/modules/system/domain/Dept.java b/system/src/main/java/com/storeroom/modules/system/domain/Dept.java index 0cf1a82..5573937 100644 --- a/system/src/main/java/com/storeroom/modules/system/domain/Dept.java +++ b/system/src/main/java/com/storeroom/modules/system/domain/Dept.java @@ -32,6 +32,7 @@ public class Dept extends BaseEntity implements Serializable { @ApiModelProperty(value = "角色") private Set roles; + @Column(name = "dept_sort") @ApiModelProperty(value = "排序") private Integer deptSort; @@ -46,6 +47,7 @@ public class Dept extends BaseEntity implements Serializable { @ApiModelProperty(value = "上级部门") private Long pid; + @Column(name = "sub_count") @ApiModelProperty(value = "子节点数目", hidden = true) private Integer subCount = 0; diff --git a/system/src/main/java/com/storeroom/modules/system/domain/Job.java b/system/src/main/java/com/storeroom/modules/system/domain/Job.java index b396b57..79932fc 100644 --- a/system/src/main/java/com/storeroom/modules/system/domain/Job.java +++ b/system/src/main/java/com/storeroom/modules/system/domain/Job.java @@ -30,6 +30,7 @@ public class Job extends BaseEntity implements Serializable { private String name; @NotNull + @Column(name = "job_sort") @ApiModelProperty(value = "岗位排序") private Long jobSort; diff --git a/system/src/main/java/com/storeroom/modules/system/domain/Menu.java b/system/src/main/java/com/storeroom/modules/system/domain/Menu.java index 71abf0b..0a7827d 100644 --- a/system/src/main/java/com/storeroom/modules/system/domain/Menu.java +++ b/system/src/main/java/com/storeroom/modules/system/domain/Menu.java @@ -38,6 +38,7 @@ public class Menu extends BaseEntity implements Serializable { @ApiModelProperty(value = "菜单组件名称") private String componentName; + @Column(name = "menu_sort") @ApiModelProperty(value = "排序") private Integer menuSort = 999; @@ -67,9 +68,11 @@ public class Menu extends BaseEntity implements Serializable { @ApiModelProperty(value = "上级菜单") private Long pid; + @Column(name = "sub_count") @ApiModelProperty(value = "子节点数目", hidden = true) private Integer subCount = 0; + @Column(name = "i_frame") @ApiModelProperty(value = "外链菜单") private Boolean iFrame = false; diff --git a/system/src/main/java/com/storeroom/modules/system/domain/Role.java b/system/src/main/java/com/storeroom/modules/system/domain/Role.java index 6542330..4df3f70 100644 --- a/system/src/main/java/com/storeroom/modules/system/domain/Role.java +++ b/system/src/main/java/com/storeroom/modules/system/domain/Role.java @@ -50,6 +50,7 @@ public class Role extends BaseEntity implements Serializable { @ApiModelProperty(value = "名称", hidden = true) private String name; + @Column(name = "data_scope") @ApiModelProperty(value = "数据权限,全部 、 本级 、 自定义") private String dataScope = DataScopeEnum.THIS_LEVEL.getValue(); diff --git a/system/src/main/java/com/storeroom/modules/system/domain/User.java b/system/src/main/java/com/storeroom/modules/system/domain/User.java index 4ff0d15..c0084a8 100644 --- a/system/src/main/java/com/storeroom/modules/system/domain/User.java +++ b/system/src/main/java/com/storeroom/modules/system/domain/User.java @@ -53,6 +53,7 @@ public class User extends BaseEntity implements Serializable { private String username; @NotBlank + @Column(name = "nick_name") @ApiModelProperty(value = "用户昵称") private String nickName; @@ -68,9 +69,11 @@ public class User extends BaseEntity implements Serializable { @ApiModelProperty(value = "用户性别") private String gender; + @Column(name = "avatar_name") @ApiModelProperty(value = "头像真实名称",hidden = true) private String avatarName; + @Column(name = "avatar_path") @ApiModelProperty(value = "头像存储的路径", hidden = true) private String avatarPath; @@ -81,6 +84,7 @@ public class User extends BaseEntity implements Serializable { @ApiModelProperty(value = "是否启用") private Boolean enabled; + @Column(name = "is_admin") @ApiModelProperty(value = "是否为admin账号", hidden = true) private Boolean isAdmin = false;