From 58a8acceb63d52377da4b837e859f2e03d2bce1b Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 14 十月 2024 08:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v3' into master-v2

---
 src/main/java/com/mzl/flower/web/customer/FlowerCustomerController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mzl/flower/web/customer/FlowerCustomerController.java b/src/main/java/com/mzl/flower/web/customer/FlowerCustomerController.java
index e29a410..1062f85 100644
--- a/src/main/java/com/mzl/flower/web/customer/FlowerCustomerController.java
+++ b/src/main/java/com/mzl/flower/web/customer/FlowerCustomerController.java
@@ -169,7 +169,7 @@
 
     @PostMapping("/order/commit")
     @ApiOperation(value = "提交订单")
-    public ResponseEntity<ReturnDataDTO<?>> commitOrder(@RequestBody OrderCommitDTO dto){
+    public ResponseEntity<ReturnDataDTO<?>> commitOrder(@RequestBody OrderCommitDTO dto) throws Exception {
         Map<Long, PriceDTO > priceMap = new HashMap<>();
         PreOrderDTO p = orderService.processPreOrderInfo(dto.getFlowers(), priceMap);
         Map map;

--
Gitblit v1.9.3