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

This commit is contained in:
yinxr 2019-01-30 11:37:51 +08:00
parent 7846fc291a cf4bb3beff
commit 4d731c6c6e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/webapp/WEB-INF/manager/index.ftl
View File

@ -10,6 +10,7 @@
<!--#include virtual="include/head-file.ftl" --> <!--#include virtual="include/head-file.ftl" -->
<!--#include virtual="./reset-password.ftl" --> <!--#include virtual="./reset-password.ftl" -->
<!--#include virtual="./exit-system.ftl" --> <!--#include virtual="./exit-system.ftl" -->
<!--
<link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/index.css"> <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/index.css">
</head> </head>

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

@ -6,10 +6,12 @@
<#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>