From aa2aa74bb418c7a2363bdb8e63599c077bea4294 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 16:33:26 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 46ae69f..87e5680 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
@@ -98,7 +98,7 @@
 			@ApiImplicitParam(value = "合作商id", name = "id", dataTypeClass = Integer.class, required = true)
 	})
 	@Log(title = "【合作商列表】删除合作商", businessType = BusinessType.DELETE)
-	public AjaxResult delPartner(@RequestParam("id") List<Integer> id){
+	public AjaxResult delPartner(List<Integer> id){
 		return partnerService.delPartner(id);
 	}
 	
@@ -148,4 +148,14 @@
 	}
 	
 	
+	/**
+	 * 根据id获取合作商信息
+	 * @param id
+	 * @return
+	 */
+	@PostMapping("/getPartnerById/{id}")
+	public R<Partner> getPartnerById(@PathVariable("id") Integer id){
+		Partner partner = partnerService.getPartner(id);
+		return R.ok(partner);
+	}
 }

--
Gitblit v1.7.1