From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/mapper/DeviceAdjustValueTimingMapper.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/mapper/DeviceAdjustValueTimingMapper.java b/src/main/java/com/moral/mapper/DeviceAdjustValueTimingMapper.java
index 4e2e73c..9113f78 100644
--- a/src/main/java/com/moral/mapper/DeviceAdjustValueTimingMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceAdjustValueTimingMapper.java
@@ -2,16 +2,20 @@
 
 
 import com.moral.common.mapper.BaseMapper;
+import com.moral.entity.DeviceAdjustValueTiming;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 public interface DeviceAdjustValueTimingMapper{
-	Map<String, Object> selectAllByDeviceid(@Param("device_id")Integer device_id);
+	List<DeviceAdjustValueTiming> selectAllByDeviceid(@Param("device_id")Integer device_id);
 
 	Map<String, Object> selectAllByDeviceidAndSeconds(@Param("device_id")Integer device_id,@Param("seconds")Integer seconds);
 
 	void insertData(@Param("device_id")Integer device_id,@Param("seconds")Integer seconds,@Param("value")String value,@Param("create_time")String create_time);
 
 	void upDataByDeviceid(@Param("value")String value,@Param("update_time")String update_time,@Param("device_id")Integer device_id);
+
+	int delete(@Param("id")String id);
 }
\ No newline at end of file

--
Gitblit v1.8.0