From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/store/mapper/StoreMapper.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/mapper/StoreMapper.java b/oying-system/src/main/java/com/oying/modules/pc/store/mapper/StoreMapper.java
index b535f17..25e8d41 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/mapper/StoreMapper.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/mapper/StoreMapper.java
@@ -3,14 +3,15 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.oying.modules.pc.store.domain.Store;
import com.oying.modules.pc.search.domain.dto.NearbyStoreQueryCriteria;
-import com.oying.modules.pc.store.domain.dto.StoreCustomerQueryCriteria;
-import com.oying.modules.pc.store.domain.dto.StoreQueryCriteria;
import com.oying.modules.pc.search.domain.dto.StoreSearchDto;
+import com.oying.modules.pc.store.domain.Store;
+import com.oying.modules.pc.store.domain.dto.StoreQueryCriteria;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.io.Serializable;
+import java.util.Collection;
import java.util.List;
/**
@@ -22,7 +23,7 @@
@Mapper
public interface StoreMapper extends BaseMapper<Store> {
- List<Store> selectStoreList(@Param("criteria") StoreQueryCriteria criteria, Page<Store> page);
+ IPage<Store> selectStoreList(@Param("criteria") StoreQueryCriteria criteria, Page<Store> page);
List<Store> selectStoreList(@Param("criteria") StoreQueryCriteria criteria);
@@ -36,4 +37,6 @@
List<Store> queryUserStores(@Param("userId") Long userId);
+ List<Store> queryByIds(@Param("ids") Collection<? extends Serializable> idList);
+
}
--
Gitblit v1.9.3