Kaynağa Gözat

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
yinxr 6 yıl önce
ebeveyn
işleme
7846fc291a

+ 1 - 0
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";

+ 3 - 1
src/main/webapp/WEB-INF/manager/login.ftl

@@ -5,9 +5,11 @@
       <title></title>
       <#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>