From 0704c6747c93db49260c7a57f12b3bacf78d9ecb Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Tue, 23 Aug 2022 11:13:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B7=AF=E7=94=B1=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apirouter/entry.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/apirouter/entry.go b/apirouter/entry.go index a3de109..ffa065b 100644 --- a/apirouter/entry.go +++ b/apirouter/entry.go @@ -3,11 +3,7 @@ package apirouter import ( "key_performance_indicators/apirouter/apishiyan" "key_performance_indicators/apirouter/empower" -<<<<<<< HEAD - mytest "key_performance_indicators/apirouter/myTest" -======= "key_performance_indicators/apirouter/v1/departmentseting" ->>>>>>> v1_dev honorsRoute "key_performance_indicators/apirouter/v1/honorsRoute" "key_performance_indicators/apirouter/v1/postseting" "key_performance_indicators/apirouter/verifyLogin" @@ -20,12 +16,8 @@ type RouterGroup struct { VerifyLogin verifyLogin.ApiRouter ShiyanApi apishiyan.ApiRouter HonorsSouteRouter honorsRoute.ApiRouter -<<<<<<< HEAD - MyTest mytest.TestApi -======= PostRouter postseting.ApiRouter DepartmentRouter departmentseting.ApiRouter ->>>>>>> v1_dev } var RouterGroupEntry = new(RouterGroup)