Skip to content

C
cms_sys
Commit 7846fc29 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 

# Conflicts:
#	src/main/webapp/WEB-INF/manager/index.ftl
parents fe65622e a6006152
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
src/main/webapp/WEB-INF/manager/include/head-file.ftl
View file @ 7846fc29
...@@ -41,6 +41,7 @@ ...@@ -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";
......
src/main/webapp/WEB-INF/manager/login.ftl
View file @ 7846fc29
...@@ -6,8 +6,10 @@ ...@@ -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>
......
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