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

rain

2024-07-31 2463dc3827e1cb3dac87ed334546ca2a57539595

 src/main/java/com/dji/sample/media/controller/FileController.java

@@ -112,10 +112,11 @@
                                       @RequestParam(name = "updateStart", required = false) Long photoStart,
                                       @RequestParam(name = "updateEnd", required = false) Long photoEnd,
                                       @RequestParam(name = "jobName", required = false) String jobName,
                                       @RequestParam(name = "jobId", required = false) String jobId,
                                       @RequestParam(required = false) String type
    ) {

        return ResponseResult.success(fileService.mediaQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName, workspaceId, type));
        return ResponseResult.success(fileService.mediaQuery(page, pageSize, updateStart, updateEnd, photoStart, photoEnd, jobName, workspaceId, type,jobId));

    }