From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期三, 30 八月 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf

---
 src/main/java/com/gk/hotwork/Mapper/GasWarnInfoMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gk/hotwork/Mapper/GasWarnInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/GasWarnInfoMapper.java
index db19f42..aa4b46a 100644
--- a/src/main/java/com/gk/hotwork/Mapper/GasWarnInfoMapper.java
+++ b/src/main/java/com/gk/hotwork/Mapper/GasWarnInfoMapper.java
@@ -12,7 +12,7 @@
 @Repository
 public interface GasWarnInfoMapper extends BaseMapper<GasWarnInfo> {
 
-    List<GasWarnInfo> selectDataGrid(Page<GasWarnInfo> page, Map<String, Object> condition);
+    List<GasWarnInfo> selectDataGrid(@Param("page") Page<GasWarnInfo> page,@Param("condition") Map<String, Object> condition);
 
     GasWarnInfo selectExistByType(@Param("id") Long id,@Param("warntype") String warntype,@Param("gastype") String gastype);
 

--
Gitblit v1.9.2