From e42b239ac2c2a922172badbe32afaa4ba4f615f8 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期一, 14 四月 2025 20:17:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/controller/OrderController.java | 13 ++++++++++++- 1 files changed, 12 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 ab39284..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,6 +1,9 @@ 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; @@ -13,7 +16,7 @@ /** * <p> - * 鍓嶇鎺у埗鍣� + * 鍓嶇鎺у埗鍣� * </p> * * @author wu @@ -37,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