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
This commit is contained in:
commit
7846fc291a
|
@ -41,6 +41,7 @@
|
||||||
<script>
|
<script>
|
||||||
ms.base = "${base}";
|
ms.base = "${base}";
|
||||||
ms.manager = "${managerPath}";
|
ms.manager = "${managerPath}";
|
||||||
|
ms.web = ms.base;
|
||||||
|
|
||||||
// ms.base = "http://192.168.0.54:85";
|
// ms.base = "http://192.168.0.54:85";
|
||||||
// ms.manager = "http://192.168.0.54:85/apis/ms";
|
// ms.manager = "http://192.168.0.54:85/apis/ms";
|
||||||
|
|
|
@ -6,8 +6,10 @@
|
||||||
<#include "/include/head-file.ftl"/>
|
<#include "/include/head-file.ftl"/>
|
||||||
<link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css">
|
<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">
|
<link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/login.css">
|
||||||
|
-->
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|
Loading…
Reference in New Issue