From 2463dc3827e1cb3dac87ed334546ca2a57539595 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 31 Jul 2024 17:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/media/controller/FileController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/controller/FileController.java b/src/main/java/com/dji/sample/media/controller/FileController.java
index 66db157..09c9b03 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/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));
}
--
Gitblit v1.9.3