Merge remote-tracking branch 'origin/majun' into majun

# Conflicts:
#	link_homework/api/v1/homework/homework.go
#	link_homework/internal/controller/homework/homework.go
#	link_homework/internal/logic/homework/homework.go
#	link_homework/internal/service/homework.go

link_homework/internal/cmd/cmd.go

@@ -46,6 +46,7 @@ var (
 				group.POST("/edit-homework", homework.Homework().EditHomework)
 				group.ALL("/get-article-list", article.Article().GetArticleList)
 				group.ALL("/get-live-list", live.Live().GetLiveList)
+				group.POST("/add-homework", homework.Homework().AddHomework)
 			})
 			//客户端
 			s.Group("/api/homework_client", func(group *ghttp.RouterGroup) {