ak
/
msopen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
yinxr 2019-01-30 11:37:39 +08:00
parent fe65622ebf a6006152e5
commit 7846fc291a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/webapp/WEB-INF/manager/include/head-file.ftl
View File

@ -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";

4
src/main/webapp/WEB-INF/manager/login.ftl
View File

@ -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>