From 249d316e0b8c79b71b779b5716bc488e1d08a9b3 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 30 Jul 2024 14:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/controller/PatchesController.java b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
index 1d4494e..f6e26b9 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -70,7 +70,7 @@
@RequestParam(name = "xmc", required = false) String xmc,
@RequestParam(name = "investigate", required = false) Integer investigate,
@RequestParam(name = "dkmj", required = false) Double dkmj,
- @RequestParam(name = "isPlan",required = false) Integer isPlan
+ @RequestParam(name = "isPush",required = false) Integer isPush
) {
fileService.getNoaddFile();
//调用service分页查询
@@ -84,7 +84,7 @@
.xmc(xmc)
.investigate(investigate)
.dkmj(dkmj)
- .isPlan(isPlan)
+ .isPush(isPush)
.build();
PaginationData<LotInfo> data = getPatchesService.limitGet(param);
return ResponseResult.success(data);
--
Gitblit v1.9.3