From 5117fe2958a1bcec82e09fce01e49bb0bc2e0ba4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 14 十二月 2022 15:11:09 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复 文件名包含特殊字符（+、-、*...）的文件无法下载问题 * update 优化 弹窗内容过多展示不全问题 * update echarts 4.9.0 => 5.4.0 * fix 修复 Vue3树形下拉不能默认选中 * update 优化 删除fuse无效选项maxPatternLength * fix 修复 代码生成图片/文件/单选时选择必填无法校验问题 * fix 修复 修改参数键名时 未移除过期缓存配置
---
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java | 48 +++++++++---------------------------------------
1 files changed, 9 insertions(+), 39 deletions(-)
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 799a6d4..b480aa0 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,12 +1,12 @@
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.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
+import lombok.EqualsAndHashCode;
/**
* 娴嬭瘯鏍戣〃瀵硅薄 test_tree
@@ -15,12 +15,11 @@
* @date 2021-07-26
*/
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
@TableName("test_tree")
-public class TestTree implements Serializable {
+public class TestTree extends TreeEntity<TestTree> {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
/**
@@ -28,11 +27,6 @@
*/
@TableId(value = "id")
private Long id;
-
- /**
- * 鐖秈d
- */
- private Long parentId;
/**
* 閮ㄩ棬id
@@ -54,30 +48,6 @@
*/
@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;
/**
* 鍒犻櫎鏍囧織
--
Gitblit v1.9.3