From 68e750bf109efb0469704e54e48a29649512358c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 18 Dec 2023 13:31:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-manage/src/main/java/com/moral/api/entity/SysDictType.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/SysDictType.java b/screen-manage/src/main/java/com/moral/api/entity/SysDictType.java
index 862e7c7..7ddf74a 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/SysDictType.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/SysDictType.java
@@ -46,6 +46,7 @@
/*
* 1������������������������������ 0���������������
* */
+ @TableField("`system`")
private Integer system;
/**
@@ -63,10 +64,5 @@
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0