From 8a8a13eb80498e9b905b47b8dc4d52cd8fdb8497 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:36:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskMapper.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskMapper.java b/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskMapper.java
index 5b30986..237f952 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskMapper.java
@@ -1,6 +1,8 @@
package com.ruoyi.inspect.mapper;
import java.util.List;
+import java.util.Map;
+
import com.ruoyi.inspect.domain.ArdVideoInspectTask;
import com.ruoyi.inspect.domain.ArdVideoInspectTaskStep;
@@ -90,6 +92,6 @@
* @return 缁撴灉
*/
public int deleteArdVideoInspectTaskStepByTaskId(String id);
-
- public List getTaskUsedCameraPeriods(String cameraId);
+ @SuppressWarnings("MybatisXMapperMethodInspection")
+ public List<Map<String,Object>> getTaskUsedCameraPeriods(String cameraId);
}
--
Gitblit v1.9.3