Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 c3a11538b96aeac198fbaa467210ef8754773ad1

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

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

    List<AssetIdleListVO> pageListIdleNoLimit(AsseIdleListQuery query);

    String getAssetTypeNameById(Integer assetTypeId);
}