diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java index f192263e7..c0e62c710 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java @@ -35,12 +35,6 @@ public class TreeEntity extends BaseEntity { @ApiModelProperty(value = "父菜单ID") private Long parentId; - /** - * 显示顺序 - */ - @ApiModelProperty(value = "显示顺序") - private String orderNum; - /** * 子部门 */ diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java index 21149d80d..74b57d991 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java @@ -1,13 +1,11 @@ package com.ruoyi.demo.domain; import com.baomidou.mybatisplus.annotation.*; +import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.io.Serializable; -import java.util.Date; - /** * 测试单表对象 test_demo * @@ -15,10 +13,10 @@ import java.util.Date; * @date 2021-07-26 */ @Data -@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @TableName("test_demo") -public class TestDemo implements Serializable { +public class TestDemo extends BaseEntity { private static final long serialVersionUID=1L; @@ -42,7 +40,7 @@ public class TestDemo implements Serializable { /** * 排序号 */ - @OrderBy(isDesc = false, sort = 1) + @OrderBy(asc = false, sort = 1) private Long orderNum; /** @@ -61,30 +59,6 @@ public class TestDemo implements Serializable { @Version private Long version; - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - /** - * 创建人 - */ - @TableField(fill = FieldFill.INSERT) - private String createBy; - - /** - * 更新时间 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; - - /** - * 更新人 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private String updateBy; - /** * 删除标志 */ diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java index 799a6d415..92e005b85 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java @@ -1,13 +1,14 @@ package com.ruoyi.demo.domain; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; +import com.ruoyi.common.core.domain.TreeEntity; import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.io.Serializable; -import java.util.Date; - /** * 测试树表对象 test_tree * @@ -15,10 +16,10 @@ import java.util.Date; * @date 2021-07-26 */ @Data -@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @TableName("test_tree") -public class TestTree implements Serializable { +public class TestTree extends TreeEntity { private static final long serialVersionUID=1L; @@ -29,11 +30,6 @@ public class TestTree implements Serializable { @TableId(value = "id") private Long id; - /** - * 父id - */ - private Long parentId; - /** * 部门id */ @@ -55,30 +51,6 @@ public class TestTree implements Serializable { @Version private Long version; - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - /** - * 创建人 - */ - @TableField(fill = FieldFill.INSERT) - private String createBy; - - /** - * 更新时间 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; - - /** - * 更新人 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private String updateBy; - /** * 删除标志 */