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

jiaosong

2023-10-17 be3c5ac348599e722864bb16670ccef5e134e8ba

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

@@ -91,7 +91,7 @@
        QueryWrapper<Bikes> wrapper = new QueryWrapper<>(bikes);
        return bikesMapper.selectList(wrapper);
    }
  

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