文章发布模块的开发

routers/router.go

@@ -4,12 +4,12 @@ import (
 	"SCRM/controllers/admin_user"
 	"SCRM/controllers/global"
 	"SCRM/controllers/login"
-	"SCRM/controllers/members"
 	"SCRM/controllers/role"
 
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/plugins/cors"
 	"SCRM/controllers/article"
+	"SCRM/controllers/members"
 )
 
 func init() {
@@ -25,13 +25,6 @@ func init() {
 	admin_user.RegisterRouters()
 	login.RegisterRouters()
 	role.RegisterRouters()
-<<<<<<< .mine
 	article.RegisterRouters()
-
-	//ÎÄÕ¹ÜÀíÄ£¿é
-=======
-	members.RegisterRouters()
-
-
->>>>>>> .theirs
+    members.RegisterRouters()
 }