Merge remote-tracking branch 'origin/master'

mitao

4 天以前 9c76b7efccd70395231b032a193a89f7638b657e

 ruoyi-system/src/main/java/com/ruoyi/system/service/AssetMainService.java

@@ -42,4 +42,11 @@
     * @return
     */
    List<AssetMainVO> getListByIds(List<Integer> assetMainIds);

    /**
     * 获取所有资产分页列表
     * @param pageQuery
     * @return
     */
    IPage<AssetMainPageVO> getAssetPageList(AssetMainPageQuery pageQuery);
}