From 1c08cdb19aa0531dc77665dbbde052133dff9ceb Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 31 十月 2023 14:10:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
index 0a958da..4d490a1 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
@@ -7,6 +7,7 @@
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.model.TStoreListVo;
import com.dsh.guns.modular.system.model.TTurn;
+import com.dsh.guns.modular.system.model.dto.SelectDto;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -18,7 +19,7 @@
* @date 2023/7/6 16:51
*/
public interface StoreMapper extends BaseMapper<TStore> {
- List<TStoreListVo> listAll(@Param("page") Page<TStoreListVo> page, @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("name") String name, @Param("phone") String phone, @Param("shopName") String shopName);
+ List<TStoreListVo> listAll(@Param("page") Page<TStoreListVo> page, @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("name") String name, @Param("phone") String phone, @Param("shopName") String shopName, @Param("operatorId") Integer operatorId);
/**
@@ -34,6 +35,7 @@
* @return
*/
List<Map<String, Object>> queryCity(@Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode);
+ List<Map<String, Object>> queryCity1();
List<Map<String, Object>> queryListOfpage(@Param("provinceCode") String provinceCode,
@Param("cityCode") String cityCode,
@@ -69,4 +71,9 @@
void inset(JsDto jsDto);
JsDto get(Integer id);
+
+ List<SelectDto> getSelect();
+
+ List<TStoreListVo> listAllStore(@Param("page") Page<TStoreListVo> page, @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("name") String name, @Param("phone") String phone, @Param("shopName") String shopName, @Param("id") Integer id);
+
}
--
Gitblit v1.7.1