Merge branch 'CRM_14.0' into debug

controllers/help_doc/classify.go

@@ -100,6 +100,7 @@ func (this *HelpDocClassifyController) ListClassify() {
 		// 重新组合 newClassifyAll
 		for _, v := range keywordClassify {
 			if v.ParentId == 3 {
+				newClassifyAll = append(newClassifyAll, v)
 				newClassifyAll = append(newClassifyAll, classifyAllMap[v.ParentId])
 			} else if v.ParentId == 2 {
 				newClassifyAll = append(newClassifyAll, v)