From c8aa05fd65cc788abc0f44494338b04993e3b4be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Sep 2021 15:08:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/entity/SysConfig.java | 9 ++-------
1 files changed, 2 insertions(+), 7 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 f3f717d..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
@@ -4,7 +4,6 @@
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;
@@ -39,12 +38,13 @@
/**
* ���������
*/
+ @TableField(value = "`code`")
private String code;
/**
* ������
*/
- @TableField("`desc`")
+ @TableField(value = "`desc`")
private String desc;
/**
@@ -62,10 +62,5 @@
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0