From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java
index 8058c97..9a1537f 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java
@@ -7,7 +7,7 @@
import com.ruoyi.manage.service.ManageRecordIntervalsTotalService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
-
+import io.swagger.annotations.Api;
import javax.annotation.Resource;
import java.util.Map;
@@ -19,6 +19,7 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-15 01:12:11
*/
+@Api(tags = "璁板綍鐨勬帶鍒�")
@RestController
@RequestMapping("/manageRecordIntervalsTotal")
public class ManageRecordIntervalsTotalController {
--
Gitblit v1.9.3