merge

jyBXSubscribe/api/internal/handler/routes.go

@@ -59,7 +59,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodPost,
-<<<<<<< HEAD
 				Path:    "/jybx/subscribe/deriveShow",
 				Handler: deriveShowHandler(serverCtx),
 			},
@@ -67,7 +66,9 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Method:  http.MethodPost,
 				Path:    "/jybx/subscribe/deriveDel",
 				Handler: deriveDelHandler(serverCtx),
-=======
+			},
+			{
+				Method:  http.MethodPost,
 				Path:    "/jybx/subscribe/getUser",
 				Handler: getUserHandler(serverCtx),
 			},
@@ -85,7 +86,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Method:  http.MethodPost,
 				Path:    "/jybx/subscribe/setPushSet",
 				Handler: setPushSetHandler(serverCtx),
->>>>>>> master
 			},
 		},
 	)