From dacae5af651baa6ae102c8dd4350a7b8b7d86fe6 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 28 Apr 2022 16:16:40 +0800
Subject: [PATCH] 通过时间和mac集合查询数据接口,修改蜂窝图小时数据接口

---
 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