Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0

4d731c6c · yinxr · 7846fc29 · cf4bb3be · 4d731c6c · 4d731c6c
Commit 4d731c6c authored Jan 30, 2019 by yinxr
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@@ -10,6 +10,7 @@
    <!--#include virtual="include/head-file.ftl" -->
    <!--#include virtual="./reset-password.ftl" -->
    <!--#include virtual="./exit-system.ftl" --> 
+    <!--
    <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/index.css">

   </head>

--- a/src/main/webapp/WEB-INF/manager/login.ftl
+++ b/src/main/webapp/WEB-INF/manager/login.ftl
@@ -6,10 +6,12 @@
      <#include "/include/head-file.ftl"/>
      <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css">
 	  
-	  <!--
-      <!--#include virtual="include/head-file.ftl" -->
+	  
+      <!--#include virtual="include/head-file.ftl"-->
+      <!--
      <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/login.css">
      -->
+      
   </head>

   <body>