Merge branch 'dev' into dev(milestone2)

src/main/java/com/redxun/knowledge/service/KnowledgeCategoryServiceImpl.java

@@ -257,6 +257,7 @@ public class KnowledgeCategoryServiceImpl extends SuperServiceImpl<KnowledgeCate
     private List<KnowledgeCategory> findAllChildren(KnowledgeCategory knowledgeCategory) {
         QueryWrapper<KnowledgeCategory> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("PARENT", knowledgeCategory.getPkId());
+        queryWrapper.orderByAsc("SORT");
         List<KnowledgeCategory> knowledgeCategories = knowledgeCategoryMapper.selectList(queryWrapper);
         return knowledgeCategories;
     }