Merge remote-tracking branch 'origin/master'

xuhy

2024-09-10 dcff8ae4cd446921c85cc956a7e27bb715c3c582

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/PartnerController.java

@@ -9,6 +9,7 @@
import com.ruoyi.chargingPile.api.query.SetPermissionConfiguration;
import com.ruoyi.chargingPile.dto.ResetPassword;
import com.ruoyi.chargingPile.service.IPartnerService;
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.common.security.utils.SecurityUtils;
@@ -68,6 +69,12 @@
      Partner partner = partnerService.getPartner(id);
      return AjaxResult.success(partner);
   }
   @ResponseBody
   @GetMapping("/getPartnerR/{id}")
   public R<Partner> getPartnerR(@PathVariable("id") Integer id){
      Partner partner = partnerService.getPartner(id);
      return R.ok(partner);
   }
   
   
   
@@ -81,12 +88,12 @@
   
   
   @ResponseBody
   @DeleteMapping("/delPartner/{id}")
   @DeleteMapping("/delPartner")
   @ApiOperation(value = "删除合作商", tags = {"管理后台-合作商管理"})
   @ApiImplicitParams({
         @ApiImplicitParam(value = "合作商id", name = "id", dataTypeClass = Integer.class, required = true)
   })
   public AjaxResult delPartner(@PathVariable("id") Integer[] id){
   public AjaxResult delPartner(@RequestParam("id") List<Integer> id){
      return partnerService.delPartner(id);
   }