From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像

---
 ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java |   61 +++++++++++++-----------------
 1 files changed, 27 insertions(+), 34 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 b9c1165..74b57d9 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,26 +1,22 @@
 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.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 娴嬭瘯鍗曡〃瀵硅薄 test_demo
  *
  * @author Lion Li
- * @date 2021-05-30
+ * @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;
 
@@ -29,46 +25,43 @@
 	 * 涓婚敭
 	 */
     @TableId(value = "id")
-	@JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    /** 閮ㄩ棬id */
+    /**
+     * 閮ㄩ棬id
+     */
     private Long deptId;
 
-    /** 鐢ㄦ埛id */
+    /**
+     * 鐢ㄦ埛id
+     */
     private Long userId;
 
-    /** 鎺掑簭鍙� */
-    @OrderBy(isDesc = false, sort = 1)
+    /**
+     * 鎺掑簭鍙�
+     */
+	@OrderBy(asc = false, sort = 1)
     private Long orderNum;
 
-    /** key閿� */
+    /**
+     * key閿�
+     */
     private String testKey;
 
-    /** 鍊� */
+    /**
+     * 鍊�
+     */
     private String value;
 
-    /** 鐗堟湰 */
+    /**
+     * 鐗堟湰
+     */
     @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;
-
-    /** 鍒犻櫎鏍囧織 */
+    /**
+     * 鍒犻櫎鏍囧織
+     */
     @TableLogic
     private Long delFlag;
 

--
Gitblit v1.9.3