From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java
index 06f0c22..cfa146d 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java
@@ -1,8 +1,12 @@
package com.mes.order.controller;
+
import com.mes.order.entity.Orderdetail;
import com.mes.order.entity.Orders;
+import com.mes.order.entity.dto.OrderDTO;
+import com.mes.order.entity.request.OrderRequest;
import com.mes.order.service.OrdersService;
import com.mes.utils.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,12 +16,13 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author wu
* @since 2024-06-17
*/
+@Api(tags = "璁㈠崟淇℃伅")
@RestController
@RequestMapping("/order/order")
@Slf4j
@@ -35,5 +40,13 @@
log.info("鏄剧ず璁㈠崟璇︽儏淇℃伅:{}", glass);
return Result.build(200, "", glass);
}
+
+ @ApiOperation("璁㈠崟鎺ュ彛鏌ヨ")
+ @PostMapping("/selectOrder") //鏄剧ず宸ョ▼閫夋嫨淇℃伅
+ @ResponseBody
+ public Result<List<OrderDTO>> selectOrder(@RequestBody OrderRequest orderRequest) {
+// OrderDTO orderDTO = new OrderDTO();
+ return Result.build(200, "", null);
+ }
}
--
Gitblit v1.8.0