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/course/mapper/StoreMapper.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
index 1bb364e..46f85c1 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
@@ -2,9 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.guns.modular.system.model.TImgConfig;
+import com.dsh.course.dto.JsDto;
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 org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -32,10 +35,11 @@
* @return
*/
List<Map<String, Object>> queryCity(@Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode);
+ List<Map<String, Object>> queryCity1();
List<Map<String, Object>> queryListOfpage(@Param("provinceCode") String provinceCode,
@Param("cityCode") String cityCode,
- @Param("cityManagerId") Integer cityManagerId,
+ @Param("operatorId") Integer operatorId,
@Param("storeName") String storeName,
@Param("page") Page<Map<String, Object>> page);
@@ -58,4 +62,18 @@
List<TTurn> pageList();
List<TTurn> getPage(@Param("ids") List<Integer> ids);
+
+ List<TImgConfig> getConfig1();
+
+ void updateBasicConfig(@Param("position") Integer position,@Param("p1") String p1);
+ void updateBasicBenefits(@Param("position") Integer position,@Param("p1") String p1);
+
+ void inset(JsDto jsDto);
+
+ JsDto get(Integer id);
+
+ List<SelectDto> getSelect();
+
+ List<TStoreListVo> listAllStore(@Param("page") Page<TStoreListVo> page, @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("name") String name, @Param("phone") String phone, @Param("shopName") String shopName, @Param("id") Integer id);
+
}
--
Gitblit v1.7.1