From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/entity/UnitConversion.java | 8 +-------
1 files changed, 1 insertions(+), 7 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..801013c 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
@@ -33,7 +33,7 @@
/**
* ���������������
*/
- private String originalUnitKey;
+ private Integer originalUnitKey;
/**
* ���������������
@@ -64,11 +64,5 @@
* ������������
*/
private String isDelete;
-
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0