From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java
index 740218f..20de46f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java
@@ -32,7 +32,7 @@
}
@ApiOperation(value = "鍒犻櫎璧勮川鏄庣粏鍒楄〃")
@DeleteMapping("/delCertificationDetail")
- public Result<?> delCertificationDetail( String ids) {
+ public Result<?> delCertificationDetail(String ids) {
return Result.success(certificationService.delCertificationDetail(ids));
}
}
--
Gitblit v1.9.3