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

rain

2024-07-15 638408723ebbf884f59ecaafcaab1c29f69bc689

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

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

    /**
     * 存储水印图片