From 1f42bd3d22c104aaa2d780c20a555b5e467858bf Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期一, 07 十一月 2022 22:10:52 +0800
Subject: [PATCH] !245 数据源由 Druid 修改为 Hikari * update 更新 dataSource 数据源, 由 druid 修改为 hikari, 更新相关配置 ;

---
 ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java |   48 ++++++++++--------------------------------------
 1 files changed, 10 insertions(+), 38 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 21149d8..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,12 +1,9 @@
 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.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
+import lombok.EqualsAndHashCode;
 
 /**
  * 娴嬭瘯鍗曡〃瀵硅薄 test_demo
@@ -15,17 +12,16 @@
  * @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")
     private Long id;
 
@@ -42,8 +38,8 @@
     /**
      * 鎺掑簭鍙�
      */
-	@OrderBy(isDesc = false, sort = 1)
-    private Long orderNum;
+    @OrderBy(asc = false, sort = 1)
+    private Integer orderNum;
 
     /**
      * key閿�
@@ -60,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