Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -2110,7 +2110,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             { "Name": "教师管理", "Url": "teacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
             { "Name": "CocoFlow", "Url": "appStore", "style": { "cssText": "background-image:url(/img/icon/appStore.png)" } },
             { "Name": "EDU", "Url": "EDU", "style": { "cssText": "background-image:url(/img/icon/EDU.png)" } },
-            // { "Name": "知识库", "Url": "knowledge", "style": { "cssText": "background-image:url(/img/icon/knowledge.png)" } },
+            { "Name": "知识库", "Url": "knowledge", "style": { "cssText": "background-image:url(/img/icon/knowledge.png)" } },
         )
     }