Merge remote-tracking branch 'origin/dev' into dev

k94314517

2023-11-03 93c42cfcfe12125c463563f191d6ade421ba9db5

 server/services/src/main/java/com/doumee/service/business/impl/RentSiteServiceImpl.java

@@ -98,7 +98,7 @@
        QueryWrapper<RentSite> wrapper = new QueryWrapper<>(rentSite);
        return rentSiteMapper.selectList(wrapper);
    }
  

    @Override
    public PageData<RentSite> findPage(PageWrap<RentSite> pageWrap) {
        IPage<RentSite> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());