Merge remote-tracking branch 'origin/master'

doum

4 天以前 c51de64d5ee334d914c90f5e4f82a13f159492ca

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

@@ -161,6 +161,8 @@
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        // 默认排序：排序码倒序、主键顺序
        queryWrapper.lambda().orderByDesc(Banner::getSortnum).orderByAsc(Banner::getId);
        PageData<Banner> result = PageData.from(bannerMapper.selectPage(page, queryWrapper));
        if (result != null && result.getRecords() != null) {
            String path = getBannerPath();