From 24b0b79158fc499f2e2f6b67e169b3b4dff97569 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Sat, 23 Mar 2024 16:58:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 5a2f11e..aa6b341 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -2,12 +2,13 @@
import com.dji.sample.patches.model.PageBean;
import com.dji.sample.patches.service.impl.PatchesServiceImpl;
-import org.opengis.geometry.coordinate.Polygon;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import java.sql.Array;
@RequestMapping("${url.patches.prefix}${url.patches.version}")
@RestController
@@ -17,9 +18,9 @@
@GetMapping("/getPatches")
public PageBean page(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "5") Integer pageSize,
- Integer id, String bsm, Polygon dkfw, String dklx){
+ Integer id, String dkbh, String dkfw){
//调用service分页查询
- PageBean pageBean =patchesServiceimpl.limitGet( id, bsm, dkfw, dklx, page, pageSize);
+ PageBean pageBean =patchesServiceimpl.limitGet( id, dkbh, dkfw,page, pageSize);
return pageBean;
}
}
--
Gitblit v1.9.3