Merge remote-tracking branch 'origin/master'

无关风月

5 天以前 8537a164dbd4c8696c3269141a8f18922d4ed15f

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

@@ -75,4 +75,5 @@

    List<AssetIdleListVO> pageListIdleNoLimit(AsseIdleListQuery query);

    String getAssetTypeNameById(Integer assetTypeId);
}