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

# Conflicts: # src/main/webapp/WEB-INF/manager/index.ftl

Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0
# Conflicts: # src/main/webapp/WEB-INF/manager/index.ftl
7846fc29 · yinxr · fe65622e · a6006152 · 7846fc29 · 7846fc29
Commit 7846fc29 authored Jan 30, 2019 by yinxr
--- a/src/main/webapp/WEB-INF/manager/include/head-file.ftl
+++ b/src/main/webapp/WEB-INF/manager/include/head-file.ftl
@@ -41,6 +41,7 @@
    <script>
        ms.base = "${base}";
        ms.manager = "${managerPath}";
+        ms.web = ms.base;

        // ms.base = "http://192.168.0.54:85";
        // ms.manager = "http://192.168.0.54:85/apis/ms";

--- a/src/main/webapp/WEB-INF/manager/login.ftl
+++ b/src/main/webapp/WEB-INF/manager/login.ftl
@@ -6,8 +6,10 @@
      <#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" -->
      <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/login.css">
+      -->
   </head>

   <body>