冲突

opms_parent/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+
 	"dashoo.cn/micro/app/handler/plat"
 
 	"dashoo.cn/micro/app/handler/base"
@@ -23,9 +24,9 @@ func main() {
 	s.RegisterName("Region", new(base.RegionHandler), "")
 	s.RegisterName("Customer", new(cust.CustomerHeader), "")
 	s.RegisterName("Contant", new(cust.CustomerContantHeader), "")
-<<<<<<< HEAD
+
 	s.RegisterName("Belong", new(cust.CustBelongHeader), "")
-=======
+
 	s.RegisterName("FollowUp", new(plat.FollowUpHandler), "")
 	s.RegisterName("FollowUpComment", new(plat.FollowUpCommentHandler), "")
 	s.RegisterName("FollowUpFile", new(plat.FollowUpFileHandler), "")
@@ -33,7 +34,6 @@ func main() {
 	s.RegisterName("TaskComment", new(plat.TaskCommentHandler), "")
 	s.RegisterName("TaskLog", new(plat.TaskLogHandler), "")
 	s.RegisterName("TaskProgress", new(plat.TaskProgressHandler), "")
->>>>>>> 55eb68c6490055b84c20771a167be1896e34fb07
 
 	// 注册服务对象
 	//s.RegisterName("Auth", new(handler.Auth), "")