From cf42a18aba4da77141dd0ea65918444636f899e1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 07 Dec 2020 10:50:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/DeviceAdjustValueTimingService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceAdjustValueTimingService.java b/src/main/java/com/moral/service/DeviceAdjustValueTimingService.java
index 61ed6d6..7bba4a3 100644
--- a/src/main/java/com/moral/service/DeviceAdjustValueTimingService.java
+++ b/src/main/java/com/moral/service/DeviceAdjustValueTimingService.java
@@ -2,11 +2,15 @@
import com.moral.common.bean.PageBean;
import com.moral.entity.DeviceAdjustValue;
+import com.moral.entity.DeviceAdjustValueTiming;
+import java.util.List;
import java.util.Map;
public interface DeviceAdjustValueTimingService {
- Map<String, Object> getDataByDeviceid(Integer device_id);
+ List<DeviceAdjustValueTiming> getDataByDeviceid(Integer device_id);
void insertData(int device_id,int seconds,String value);
+
+ int delete(String id);
}
--
Gitblit v1.8.0