From c2fa12a34eab9acf275915f551bf7c7d720ca2b1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 20 Feb 2024 09:11:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.java b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.java
index d8e97b2..c1f9379 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.java
@@ -16,7 +16,7 @@
*/
package org.springblade.modules.task.mapper;
-import io.lettuce.core.dynamic.annotation.Param;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.task.dto.TaskLabelReportingEventDTO;
import org.springblade.modules.task.entity.TaskLabelReportingEventEntity;
import org.springblade.modules.task.vo.TaskLabelReportingEventVO;
@@ -39,7 +39,11 @@
* @param taskLabelReportingEvent
* @return
*/
- List<TaskLabelReportingEventVO> selectTaskLabelReportingEventPage(IPage page,TaskLabelReportingEventVO taskLabelReportingEvent);
+ List<TaskLabelReportingEventVO> selectTaskLabelReportingEventPage(IPage page,
+ @Param("taskLabelReportingEvent") TaskLabelReportingEventVO taskLabelReportingEvent,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("gridCodeList") List<String> gridCodeList);
--
Gitblit v1.9.3