冲突解决

zss

2 天以前 ecd6e50d0bb2c74e4b3f7a23e0d44f5e001987ea

 src/main/java/com/ruoyi/basic/service/StorageAttachmentService.java

@@ -34,6 +34,9 @@
     */
    public void saveStorageAttachment(List<StorageAttachment> attachments, Long recordId, StorageAttachmentRecordType recordType, StorageAttachmentConstants fileType);

    public void saveStorageAttachment(List<StorageAttachment> attachments, Long recordId, StorageAttachmentRecordType recordType, String fileType);


    /**
     * 删除通用文件上传的附件信息
     * @param storageAttachment 文件信息