From 82841afc4e140f72fdeb378102e0e9a978bbe14c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 14 Sep 2021 10:26:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/entity/UnitConversion.java | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/UnitConversion.java b/screen-api/src/main/java/com/moral/api/entity/UnitConversion.java
index 962842d..0186724 100644
--- a/screen-api/src/main/java/com/moral/api/entity/UnitConversion.java
+++ b/screen-api/src/main/java/com/moral/api/entity/UnitConversion.java
@@ -65,10 +65,4 @@
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
}
--
Gitblit v1.8.0