Merge remote-tracking branch 'origin/master'

luo

2023-10-08 1cb12391db6154f2d1a8fdf8e0506fe3f3eb2f15

 cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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;
@@ -35,7 +36,7 @@

    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 +59,8 @@
    List<TTurn> pageList();

    List<TTurn> getPage(@Param("ids") List<Integer> ids);

    void inset(JsDto jsDto);

    JsDto get(Integer id);
}