From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/entity/SysConfig.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/SysConfig.java b/screen-manage/src/main/java/com/moral/api/entity/SysConfig.java
index dd0a1f3..a4fa28e 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/SysConfig.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/SysConfig.java
@@ -1,10 +1,12 @@
package com.moral.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -36,32 +38,29 @@
/**
* ���������
*/
+ @TableField(value = "`code`")
private String code;
/**
* ������
*/
+ @TableField(value = "`desc`")
private String desc;
/**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* ������������
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0