From 6a397303b1973db2486444bc76d4fa4cf8615020 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Wed, 30 Jan 2019 11:27:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E8=8C=83=E4=BE=8B?= =?UTF-8?q?=E3=80=81=E4=BB=A3=E7=A0=81=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/manager/index.ftl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl index 57c2c3fd..08a0ed75 100644 --- a/src/main/webapp/WEB-INF/manager/index.ftl +++ b/src/main/webapp/WEB-INF/manager/index.ftl @@ -2,15 +2,17 @@ - <#include "/include/head-file.ftl"/> - <#include "/reset-password.ftl"/> - <#include "/exit-system.ftl"/> - + <#include "/include/head-file.ftl"/> + <#include "/reset-password.ftl"/> + <#include "/exit-system.ftl"/> + + + --> From a6006152e51dc0726de6178ab0d02161a7921de4 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Wed, 30 Jan 2019 11:30:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/manager/include/head-file.ftl | 1 + src/main/webapp/WEB-INF/manager/login.ftl | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/manager/include/head-file.ftl b/src/main/webapp/WEB-INF/manager/include/head-file.ftl index 7d4ee8fa..f6d6d64f 100644 --- a/src/main/webapp/WEB-INF/manager/include/head-file.ftl +++ b/src/main/webapp/WEB-INF/manager/include/head-file.ftl @@ -41,6 +41,7 @@