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/impl/StoreServiceImpl.java |    8 ++++++++
 1 files changed, 8 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 f66f1c7..c0d57e0 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
@@ -24,6 +24,10 @@
     public List<TStoreListVo> listAll(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName) {
         return this.baseMapper.listAll(page,provinceCode,cityCode,name,phone,shopName);
     }
+    @Override
+    public List<TStoreListVo> listAllStore(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName,Integer id) {
+        return this.baseMapper.listAllStore(page,provinceCode,cityCode,name,phone,shopName,id);
+    }
 
     /**
      * 获取所有省
@@ -44,6 +48,10 @@
     public List<Map<String, Object>> queryCity(String provinceCode, String cityCode) {
         return this.baseMapper.queryCity(provinceCode, cityCode);
     }
+    @Override
+    public List<Map<String, Object>> queryCity1() {
+        return this.baseMapper.queryCity1();
+    }
 
     @Override
     public List<Map<String, Object>> queryListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page) {

--
Gitblit v1.7.1