From 6ed95e119bb127488afd9b0eaf98cc7b170a5cef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 八月 2024 09:20:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java
index 4fac393..e94628d 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java
@@ -48,11 +48,11 @@
@ResponseBody
@GetMapping("/getPartner/{id}")
- @ApiOperation(value = "添加合作商", tags = {"管理后台-合作商列表"})
+ @ApiOperation(value = "获取合作商详情", tags = {"管理后台-合作商列表"})
@ApiImplicitParams({
@ApiImplicitParam(value = "合作商id", name = "id", dataTypeClass = Integer.class, required = true)
})
- public AjaxResult<Partner> getPartner(@PathVariable @RequestParam Integer id){
+ public AjaxResult<Partner> getPartner(@PathVariable Integer id){
Partner partner = partnerService.getPartner(id);
return AjaxResult.success(partner);
}
@@ -70,13 +70,12 @@
@ResponseBody
@DeleteMapping("/delPartner/{id}")
- @ApiOperation(value = "编辑合作商", tags = {"管理后台-合作商列表"})
+ @ApiOperation(value = "删除合作商", tags = {"管理后台-合作商列表"})
@ApiImplicitParams({
@ApiImplicitParam(value = "合作商id", name = "id", dataTypeClass = Integer.class, required = true)
})
- public AjaxResult delPartner(@PathVariable @RequestParam Integer id){
- partnerService.delPartner(id);
- return AjaxResult.success();
+ public AjaxResult delPartner(@PathVariable("id") Integer id){
+ return partnerService.delPartner(id);
}
--
Gitblit v1.7.1