From 008be75ef25dd2c7e8553fe79ec25722f4c2ea48 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 31 五月 2024 14:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/ycl/jxkg/domain/entity/UserEventLog.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/domain/UserEventLog.java b/src/main/java/com/ycl/jxkg/domain/entity/UserEventLog.java
similarity index 69%
rename from src/main/java/com/ycl/jxkg/domain/UserEventLog.java
rename to src/main/java/com/ycl/jxkg/domain/entity/UserEventLog.java
index cd18357..5262fed 100644
--- a/src/main/java/com/ycl/jxkg/domain/UserEventLog.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/UserEventLog.java
@@ -1,6 +1,8 @@
-package com.ycl.jxkg.domain;
+package com.ycl.jxkg.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ycl.jxkg.domain.base.AbsEntity;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -8,10 +10,7 @@
 
 @Data
 @TableName("t_user_event_log")
-public class UserEventLog implements Serializable {
-
-    private static final long serialVersionUID = -3951198127152024633L;
-
+public class UserEventLog extends AbsEntity {
 
     public UserEventLog() {
 
@@ -24,31 +23,34 @@
         this.createTime = createTime;
     }
 
-    private Integer id;
-
     /**
      * 鐢ㄦ埛id
      */
+    @TableField("user_id")
     private Integer userId;
 
     /**
      * 鐢ㄦ埛鍚�
      */
+    @TableField("user_name")
     private String userName;
 
     /**
      * 鐪熷疄濮撳悕
      */
+    @TableField("real_name")
     private String realName;
 
     /**
      * 鍐呭
      */
+    @TableField("content")
     private String content;
 
     /**
      * 鏃堕棿
      */
+    @TableField("create_time")
     private Date createTime;
 
 }

--
Gitblit v1.8.0