From ed2ca4bd91889878f5cc40ea9cd1d4afd8240dfd Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 25 十一月 2024 18:27:18 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 6531a59..956dc80 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -13,9 +13,7 @@
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.service.TechnicianService;
import com.ruoyi.other.vo.VerifiableShopVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -31,7 +29,7 @@
*/
@RestController
@RequestMapping("/shop")
-@Api("门店")
+@Api(tags = "门店")
public class ShopController extends BaseController {
@Resource
private TechnicianService technicianService;
@@ -92,7 +90,10 @@
@ResponseBody
@GetMapping("/getVerifiableShop")
@ApiOperation(value = "获取可核销门店列表", tags = {"购物车-小程序"})
- public AjaxResult<List<VerifiableShopVo>> getVerifiableShop(){
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "goodsId", value = "商品id数组", required = true, dataType = "int"),
+ })
+ public AjaxResult<List<VerifiableShopVo>> getVerifiableShop(List<Integer> goodsId){
// todo 待完善 pu
return AjaxResult.success();
}
--
Gitblit v1.7.1