From 6e2ffa951a5a08366e001a6bdec958eba9abcf99 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 19 Jan 2026 15:15:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java
index cdd1285..cf4ad84 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java
@@ -32,7 +32,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
-import org.sxkj.gd.workorder.param.WorkOrderParam;
+import org.sxkj.gd.workorder.param.WorkOrderAddParam;
+import org.sxkj.gd.workorder.param.WorkOrderPageParam;
import org.sxkj.gd.workorder.param.WorkOrderStatusParam;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.gd.workorder.excel.GdWorkOrderExcel;
@@ -79,7 +80,7 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入gdWorkOrder")
- public R<IPage<GdWorkOrderVO>> page(GdWorkOrderVO gdWorkOrder, Query query) {
+ public R<IPage<GdWorkOrderVO>> page(WorkOrderPageParam gdWorkOrder, Query query) {
IPage<GdWorkOrderVO> pages = gdWorkOrderService.selectGdWorkOrderPage(Condition.getPage(query), gdWorkOrder);
return R.data(pages);
}
@@ -90,7 +91,7 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入gdWorkOrder")
- public R save(@Valid @RequestBody WorkOrderParam workOrderParam) {
+ public R save(@Valid @RequestBody WorkOrderAddParam workOrderParam) {
return R.status(gdWorkOrderService.saveWorkOrder(workOrderParam));
}
//
--
Gitblit v1.9.3