From 27be7a2c517404e4622470edf7b83b13129220ff Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 08 十二月 2023 11:14:04 +0800
Subject: [PATCH] merge conflicts

---
 router/router.go |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/router/router.go b/router/router.go
index bef5f29..ae57b87 100644
--- a/router/router.go
+++ b/router/router.go
@@ -81,6 +81,7 @@
 	operationAPI := r.Group(urlPrefix + "/operation")
 	{
 		operationAPI.POST("list", operationController.List)
+		operationAPI.GET("getOperationInfo/:id", operationController.GetOperationInfo)
 		operationAPI.POST("operation", operationController.Add)
 		operationAPI.POST("update", operationController.Update)
 		operationAPI.DELETE("operation/:id", operationController.Delete)

--
Gitblit v1.8.0