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 | 14 ++++++++++++++
1 files changed, 14 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 2ac311e..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
@@ -8,6 +8,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 com.dsh.guns.modular.system.service.IStoreService;
import org.springframework.stereotype.Service;
@@ -22,6 +23,10 @@
@Override
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);
}
/**
@@ -42,6 +47,10 @@
@Override
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
@@ -104,6 +113,11 @@
}
@Override
+ public List<SelectDto> getSelect() {
+ return this.baseMapper.getSelect();
+ }
+
+ @Override
public List<TImgConfig> getConfig() {
return this.baseMapper.getConfig1();
--
Gitblit v1.7.1