Skip to content

C
cms_sys
Commit 4d731c6c authored by yinxr's avatar yinxr
Browse files
Options

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

parents 7846fc29 cf4bb3be
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
src/main/webapp/WEB-INF/manager/index.ftl
View file @ 4d731c6c
...@@ -10,6 +10,7 @@ ...@@ -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>
......
src/main/webapp/WEB-INF/manager/login.ftl
View file @ 4d731c6c
...@@ -6,10 +6,12 @@ ...@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment