From 3530f728388d91b09a62fbd8f82d3a56b1ff265b Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 10:36:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java
index 01baa7a..3eba3ee 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java
@@ -38,6 +38,7 @@
      * @return
      */
     List<Map<String, Object>> queryCity(String provinceCode, String cityCode);
+    List<Map<String, Object>> queryCity1();
 
     List<Map<String, Object>> queryListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page);
 
@@ -74,4 +75,8 @@
     JsDto get(Integer id);
 
     List<SelectDto> getSelect();
+
+    List<TStoreListVo> listAllStore(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName, Integer objectId);
+
+
 }

--
Gitblit v1.7.1