From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 十一月 2022 15:14:47 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回
---
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java | 51 ++++++++++-----------------------------------------
1 files changed, 10 insertions(+), 41 deletions(-)
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 13fdc24..dc19ce2 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,14 +1,9 @@
package com.ruoyi.demo.domain;
import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
+import lombok.EqualsAndHashCode;
/**
* 娴嬭瘯鍗曡〃瀵硅薄 test_demo
@@ -17,19 +12,17 @@
* @date 2021-07-26
*/
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
@TableName("test_demo")
-public class TestDemo implements Serializable {
+public class TestDemo extends BaseEntity {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 涓婚敭
- */
+ /**
+ * 涓婚敭
+ */
@TableId(value = "id")
- @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -45,8 +38,8 @@
/**
* 鎺掑簭鍙�
*/
- @OrderBy(isDesc = false, sort = 1)
- private Long orderNum;
+ @OrderBy(asc = false, sort = 1)
+ private Integer orderNum;
/**
* key閿�
@@ -63,30 +56,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