From 17d054803583cd870dc15dc16551563ff619c658 Mon Sep 17 00:00:00 2001
From: jpy <812110275@qq.com>
Date: Sat, 27 May 2023 16:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java b/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java
index 348cd15..0a5f242 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
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;
@@ -65,11 +66,5 @@
*/
private String isDelete;
-
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0