From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcCallEventTwoMapper.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcCallEventTwoMapper.java b/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcCallEventTwoMapper.java
index ca0f81c..86c7ff4 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcCallEventTwoMapper.java
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcCallEventTwoMapper.java
@@ -16,11 +16,14 @@
*/
package org.springblade.modules.eCallEventTwo.mapper;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.eCallEventTwo.dto.ECallEventTwoDTO;
import org.springblade.modules.eCallEventTwo.entity.ECallEventTwoEntity;
import org.springblade.modules.eCallEventTwo.vo.ECallEventTwoVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
import java.util.List;
/**
@@ -29,6 +32,7 @@
* @author BladeX
* @since 2024-05-15
*/
+@DS("master")
public interface EcCallEventTwoMapper extends BaseMapper<ECallEventTwoEntity> {
/**
@@ -38,7 +42,11 @@
* @param eCallEventTwo
* @return
*/
- List<ECallEventTwoVO> selectECallEventTwoPage(IPage page, ECallEventTwoVO eCallEventTwo);
+ List<ECallEventTwoVO> selectECallEventTwoPage(IPage page,
+ @Param("eCallEventTwo") ECallEventTwoVO eCallEventTwo,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator);
--
Gitblit v1.9.3