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/EquipmentInfoMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Mapper/EquipmentInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/EquipmentInfoMapper.java
index 7e81454..85e0be0 100644
--- a/src/main/java/com/gk/hotwork/Mapper/EquipmentInfoMapper.java
+++ b/src/main/java/com/gk/hotwork/Mapper/EquipmentInfoMapper.java
@@ -12,7 +12,7 @@
@Repository
public interface EquipmentInfoMapper extends BaseMapper<EquipmentInfo> {
- List<EquipmentInfo> selectDataGrid(Page<EquipmentInfo> page, Map<String, Object> condition);
+ List<EquipmentInfo> selectDataGrid(@Param("page") Page<EquipmentInfo> page,@Param("condition") Map<String, Object> condition);
EquipmentInfo selectExistByNumber(@Param("id") Long id,@Param("number") String number);
@@ -20,7 +20,7 @@
List<EquipmentInfo> selectByTask(@Param("taskcode") String taskcode);
- List<EquipmentInfo> selectByTaskAndWorker(@Param("code")String code, @Param("worker")String worker);
+ List<EquipmentInfo> selectByTaskAndWorker(@Param("code")String code, @Param("worker") String worker);
List<EquipmentInfo> selectUsingByTask(@Param("code") String code);
}
--
Gitblit v1.9.2