Merge branch 'master' into develop

TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -771,7 +771,7 @@ export default {
                     child: [],
                     permission: '',
                     menuName: 'privSokrate',
-                    isShow: true,
+                    isShow: this.IES5Menu,
                     to: 'privSokrate'
                 },
                 // 我的资源