From a7dd93b840bdce4bd0011bc948157f440514a207 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 16:36:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
index c5023eb..d622e99 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
@@ -8,7 +8,7 @@
import com.ruoyi.collaborativeApproval.service.DutyPlanService;
import com.ruoyi.common.utils.excel.ExcelUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -24,30 +24,30 @@
private DutyPlanService dutyPlanService;
@GetMapping("/getList")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, DutyPlanDTO dutyPlanDTO){
return AjaxResult.success(dutyPlanService.listPage(page, dutyPlanDTO));
}
@GetMapping("/getNum")
- @ApiOperation("鑾峰彇绛夌骇鏁版嵁")
+ @Operation(summary = "鑾峰彇绛夌骇鏁版嵁")
public AjaxResult getNum(){
return AjaxResult.success(dutyPlanService.getNum());
}
@PostMapping("/add")
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public AjaxResult add(@RequestBody DutyPlan dutyPlan){
return AjaxResult.success(dutyPlanService.save(dutyPlan));
}
@PostMapping("/update")
- @ApiOperation("淇敼")
+ @Operation(summary = "淇敼")
public AjaxResult update(@RequestBody DutyPlan dutyPlan){
return AjaxResult.success(dutyPlanService.updateById(dutyPlan));
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public AjaxResult delete(@RequestBody List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -55,7 +55,7 @@
return AjaxResult.success(dutyPlanService.removeBatchByIds(ids));
}
@PostMapping("/export")
- @ApiOperation("瀵煎嚭")
+ @Operation(summary = "瀵煎嚭")
public void exportData(HttpServletResponse response, DutyPlanDTO dutyPlanDTO){
dutyPlanService.exportData(response, dutyPlanDTO);
}
--
Gitblit v1.9.3