Merge remote-tracking branch 'origin/master'

doum

20 小时以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopNewsServiceImpl.java

@@ -204,7 +204,7 @@
    }

    @Override
    public Integer count(ShopNews shopNews) {
    public long count(ShopNews shopNews) {
        QueryWrapper<ShopNews> wrapper = new QueryWrapper<>(shopNews);
        return shopNewsMapper.selectCount(wrapper);
    }