From 430477c7e0777531f22fc18dc8906ea75cdc21d9 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Wed, 03 Dec 2025 16:53:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/EnvironmentDemandRiskController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/EnvironmentDemandRiskController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/EnvironmentDemandRiskController.java
index 6e3f562..1497f7c 100644
--- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/EnvironmentDemandRiskController.java
+++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/EnvironmentDemandRiskController.java
@@ -131,8 +131,8 @@
      */
     @ApiOperation(value = "内外部环境要素控制删除")
     @GetMapping("/factor/control/deleted")
-    public CommonResult deletedFactorControl(@RequestParam("factorControlId") Integer factorControlId){
-        return factorControlService.deletedFactorControl(factorControlId);
+    public CommonResult deletedFactorControl(@RequestParam("factorControlId") Integer factorControlId,@RequestParam("factorDiscrenId") Integer factorDiscrenId){
+        return factorControlService.deletedFactorControl(factorControlId,factorDiscrenId);
     }
 
     /**

--
Gitblit v1.9.2