Merge remote-tracking branch 'origin/master'

mitao

3 天以前 dfe379f10f5d16a3b34b33f260d3a7ca97c7fdc6

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

@@ -536,4 +536,14 @@
        return list;
    }

    @Override
    public String getAssetTypeNameById(Integer assetTypeId) {
        if (assetTypeId != null) {
            AssetType assetType = this.getById(assetTypeId);
            if (assetType != null) {
                return assetType.getTypeName();
            }
        }
        return null;
    }
}