Merge remote-tracking branch 'origin/ht-dev' into ht-dev

rain

2024-07-09 1e0c6ba7f21e273fd14065073920a9b7b9c2cd54

 src/main/java/com/dji/sample/media/service/IFileService.java

@@ -37,7 +37,7 @@
     * @param file
     * @return
     */
    Integer saveFile(String workspaceId, FileUploadDTO file);
    Integer saveFile(String workspaceId, FileUploadDTO file) throws ImageProcessingException, IOException;

    /**
     * 存储水印图片