From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 c7d818e..03b6630 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
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.guns.modular.system.model.*;
+import com.dsh.guns.modular.system.model.dto.SelectDto;
+import io.swagger.models.auth.In;
import com.dsh.course.dto.JsDto;
import com.dsh.guns.modular.system.model.Dict;
import com.dsh.guns.modular.system.model.TStore;
@@ -27,7 +30,7 @@
*/
List<Map<String, Object>> queryProvince(String cityCode);
- List<TStoreListVo> listAll(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName);
+ List<TStoreListVo> listAll(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName,Integer objectId);
/**
* 根据省编号获取所有市
@@ -35,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);
@@ -61,7 +65,18 @@
List<TTurn> getPage(List<Integer> ids);
+ List<TImgConfig> getConfig();
+
+ void updateBasicConfig(Integer id , String p1);
+ void updateBenefits(Integer id , String p1);
+
void insert(JsDto jsDto);
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