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/guns/modular/system/service/impl/StoreServiceImpl.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
index b52ad11..2dc8277 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
@@ -29,6 +29,11 @@
         return this.baseMapper.listAllStore(page,provinceCode,cityCode,name,phone,shopName,id);
     }
 
+    @Override
+    public List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName) {
+        return this.baseMapper.querySiteListOfpage(provinceCode,cityCode,operatorId,storeName);
+    }
+
     /**
      * 获取所有省
      * @return
@@ -45,6 +50,10 @@
      * @return
      */
     @Override
+    public List<Map<String, Object>> queryCity2(String provinceCode, String cityCode,Integer type,Integer operatorId) {
+        return this.baseMapper.queryCity2(provinceCode, cityCode,type,operatorId);
+    }
+    @Override
     public List<Map<String, Object>> queryCity(String provinceCode, String cityCode) {
         return this.baseMapper.queryCity(provinceCode, cityCode);
     }

--
Gitblit v1.7.1