From 5fad5b026148771b103a6eed0e46dfcad3ee24a0 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 25 十一月 2024 18:38:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 1d3b5e8..e913905 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -22,7 +22,7 @@
* @author luodangjia
* @since 2024-11-21
*/
-@Api("订单")
+@Api(tags = "订单")
@RestController
@RequestMapping("/order")
public class OrderController {
@@ -33,13 +33,13 @@
/**
* 扫码校验
*/
- @ApiOperation(value = "扫码校验", tags = {"订单核销"})
+ @ApiOperation(value = "扫码校验", tags = {"小程序-个人中心-门店管理-扫码核销校验"})
@ApiImplicitParams({
@ApiImplicitParam(value = "分享id", name = "shareId", required = true, dataType = "int"),
})
@GetMapping("/check/{orderId}/{shopId}")
public AjaxResult check(@PathVariable("orderId") Integer orderId, @PathVariable("shopId") Integer shopId){
- return AjaxResult.success(orderService.check(orderId, shopId));
+ return AjaxResult.ok(orderService.check(orderId, shopId));
}
/**
--
Gitblit v1.7.1