From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 e5c79f1..edf5cef 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
@@ -34,7 +34,12 @@
* @param provinceCode
* @return
*/
- List<Map<String, Object>> queryCity(@Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode);
+ List<Map<String, Object>> queryCity(@Param("provinceCode") String provinceCode,
+ @Param("cityCode") String cityCode);
+ List<Map<String, Object>> queryCity2(@Param("provinceCode") String provinceCode,
+ @Param("cityCode") String cityCode,
+ @Param("type") Integer type,
+ @Param("operatorId") Integer operatorId);
List<Map<String, Object>> queryCity1();
List<Map<String, Object>> queryListOfpage(@Param("provinceCode") String provinceCode,
@@ -88,8 +93,8 @@
List<Map<String, Object>> querySiteListOfpage(@Param("provinceCode") String provinceCode,
@Param("cityCode") String cityCode,
@Param("operatorId") Integer operatorId,
- @Param("storeName") String storeName,
- @Param("page") Page<Map<String, Object>> page);
+ @Param("storeName") String storeName
+ );
}
--
Gitblit v1.7.1