全部合并远端分支origin/feature/api-key

internal/handler/routes.go

@@ -52,7 +52,7 @@ import (
 	wxcarduser "wechat-api/internal/handler/wxcarduser"
 	wxcardvisit "wechat-api/internal/handler/wxcardvisit"
 	xiaoice "wechat-api/internal/handler/xiaoice"
-	api_key "wechat-api/internal/handler/api_key"
+	
 	"wechat-api/internal/svc"
 
 	"github.com/zeromicro/go-zero/rest"

internal/logic/api_key/create_api_key_logic.go

@@ -5,21 +5,13 @@ import (
 	"crypto/rand"
 	"encoding/base64"
 	"fmt"
-<<<<<<< HEAD
-=======
-	"github.com/suyuan32/simple-admin-common/msg/errormsg"
-	"github.com/zeromicro/go-zero/core/errorx"
->>>>>>> origin/feature/api-key
+
 	"wechat-api/internal/svc"
 	"wechat-api/internal/types"
 	"wechat-api/internal/utils/dberrorhandler"
 
-<<<<<<< HEAD
 	"github.com/suyuan32/simple-admin-common/msg/errormsg"
 	"github.com/zeromicro/go-zero/core/errorx"
-
-=======
->>>>>>> origin/feature/api-key
 	"github.com/zeromicro/go-zero/core/logx"
 )
 

internal/types/types.go

@@ -4223,8 +4223,5 @@ type ApiKeyListReq struct {
 	// Key
 	Key            *string `json:"key,optional"`
 	OrganizationId *uint64 `json:"organization_id,optional"`
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> origin/feature/api-key
+