From 950f31ee2351e2d26ede3eeba49c09d52f46b296 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 03 十一月 2023 17:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java
index fbd225b..6455a6b 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.inspect.controller;
 
+import java.util.HashMap;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -42,7 +43,7 @@
     @GetMapping("/listByStartTime")
     public TableDataInfo listByStartTime(ArdVideoInspectRecord ardVideoInspectRecord) {
         startPage();
-        List list = ardVideoInspectRecordService.selectArdVideoInspectRecordListByStartTime(ardVideoInspectRecord);
+        List<HashMap> list = ardVideoInspectRecordService.selectArdVideoInspectRecordListByStartTime(ardVideoInspectRecord);
         return getDataTable(list);
     }
 

--
Gitblit v1.9.3