Merge remote-tracking branch 'origin/master'

luo

2023-10-08 1cb12391db6154f2d1a8fdf8e0506fe3f3eb2f15

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java

@@ -2,9 +2,11 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.course.dto.JsDto;
import com.dsh.course.mapper.StoreMapper;
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.service.IStoreService;
import org.springframework.stereotype.Service;

@@ -42,8 +44,8 @@
    }

    @Override
    public List<Map<String, Object>> queryListOfpage(String provinceCode, String cityCode, Integer cityManagerId, String storeName, Page<Map<String, Object>> page) {
        return this.baseMapper.queryListOfpage(provinceCode,cityCode,cityManagerId,storeName,page);
    public List<Map<String, Object>> queryListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page) {
        return this.baseMapper.queryListOfpage(provinceCode,cityCode,operatorId,storeName,page);
    }

    @Override
@@ -79,4 +81,24 @@
    public void delete1(Integer id) {
        this.baseMapper.delete1(id);
    }

    @Override
    public List<TTurn> pageList() {
        return this.baseMapper.pageList();
    }

    @Override
    public List<TTurn> getPage(List<Integer> ids) {
        return this.baseMapper.getPage(ids);
    }

    @Override
    public void insert(JsDto jsDto) {
        this.baseMapper.inset(jsDto);
    }

    @Override
    public JsDto get(Integer id) {
        return this.baseMapper.get(id);
    }
}