From 2d338a0e7480330ecb78e6d5471c2f47867b0a80 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 05 九月 2024 17:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
index 7beaf25..1ad49f2 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
@@ -2,6 +2,7 @@
import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TExchangeOrder;
@@ -51,9 +52,9 @@
}
@PostMapping("/addVipOrder")
@ApiOperation(value = "添加会员订单", tags = {"管理后台-会员订单"})
- public AjaxResult addVipOrder(@RequestBody TVipOrder dto) {
+ public R<Long> addVipOrder(@RequestBody TVipOrder dto) {
vipOrderService.saveOrUpdate(dto);
- return AjaxResult.success();
+ return R.ok(dto.getId());
}
@GetMapping("/deleteVipOrder")
@ApiOperation(value = "批量删除会员订单", tags = {"管理后台-会员订单"})
--
Gitblit v1.7.1