From f0a5a28345ed6764ac033a585f1e6b7cbcf8d102 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 27 Sep 2023 11:31:52 +0800
Subject: [PATCH] Merge branch 'wb' into qa
---
screen-api/src/main/java/com/moral/api/entity/UnitConversion.java | 2 +-
1 files changed, 1 insertions(+), 1 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 0186724..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;
/**
* ���������������
--
Gitblit v1.8.0