Merge remote-tracking branch 'origin/master'

无关风月

5 天以前 acbe0c6c601ff1368002d701631a43a2c00b61f5

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetMainServiceImpl.java

@@ -312,4 +312,10 @@
        }
        return Collections.emptyList();
    }

    @Override
    public IPage<AssetMainPageVO> getAssetPageList(AssetMainPageQuery pageQuery) {
        Page<AssetMainPageVO> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
        return this.baseMapper.getAssetPageList(page, pageQuery);
    }
}