From fe65622ebfe37d7b77d1b43ba72a515511f14e91 Mon Sep 17 00:00:00 2001
From: yinxr <2273460044@qq.com>
Date: Wed, 30 Jan 2019 11:32:03 +0800
Subject: [PATCH 1/7] Signed-off-by: yinxr <2273460044@qq.com>
---
src/main/webapp/WEB-INF/manager/index.ftl | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl
index 57c2c3fd..d0060f89 100644
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@@ -2,9 +2,9 @@
- <#include "/include/head-file.ftl"/>
+
@@ -81,6 +81,7 @@
:collapse-transition='true'
:unique-opened='true'
ref='menu'
+ :default-openeds='subMenuList'
>
-1
? resetPasswordVue.isShow=true : exitSystemVue.isShow=true
}
From 940b4a586f0332948022a3c28220119944b30d8f Mon Sep 17 00:00:00 2001
From: ms-dev
Date: Wed, 30 Jan 2019 14:24:08 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ms-admin/4.7.0/images/default_handsome.jpg | Bin 0 -> 3474 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 src/main/webapp/static/ms-admin/4.7.0/images/default_handsome.jpg
diff --git a/src/main/webapp/static/ms-admin/4.7.0/images/default_handsome.jpg b/src/main/webapp/static/ms-admin/4.7.0/images/default_handsome.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..edcea88f5c43c2107589155e041bf9e83c3087e0
GIT binary patch
literal 3474
zcmbVNc{r478-K^xPT2<)Vj7{6F^d^9lc~d4T2NVrtY
zMz~EBDT*D&rt@j=C^m}|L5d1=%vfxA*fAe5Zj|k>5!uSj>2fpBu7Q_|s$p|ph
zFD0rYw4exP
zL)y+`fQLe3*>i&hY&wU(#h#1+CCCs)2np|qw!+{XaaI@%3Qs_z2`B=V;An***kLIY
z0@~r5kDuA1@Hh&FNU_G+I#AGP2P-=))`38=BVs7_M4Tgr^38S&CxTDo1k=C8Wq@(N
z+T#DwmPFyvX?!lvgUe-oL%@!`Ts}8qFEKf{5DlnL~HVkH?Mrmh0(g>gatJ
z{I46?9Y9kVhytRZ5KTZ%69UzQ$m)R%@TQQ1LLiVImx#OqR8dJzd4UH?e((VRssNFb
zSJVLH3gsQ5ClPCAGs`(eQ=w%
zWSWK(bam7DV3qV$U`rMV+R*LkuwBq=3LTCzVOqW#>iI{y6TD!IvFSn(g?
zf`Z1Z53{M*m;h#vZVRqfAmpTvwA?JfPt*m;fJ1^9q$_r%Pvxeq=La@0qRQ6^8Ck9-
zLTmf4%^8e;JMDRdIXvd|7fN^NSgh@U|DKOdgG6E9z59m>Wq?~pjJ5Pu?nu7n;X+3R
zb`ys!NmQ!yP(${qXTpwrL==+TSi^+ALoMf+P_xK~rLFIawJN&*{Vcy7e%^l0zVqMCYxmL0{(Mus
zMNmy+bbCeGSwpi{s!s&byFLhJx&r*^h-ARTgPs6uYFnny?<<}>>eB3^vv%b444%s}
z!|`6H7Pm`U8YW|`HHa@oR1r^fY~;X;6#0sF;|YP<~d_<@(v#U9Ub#H#K3aIjIa
zE^W2i{o}qyhl@|Y!o*w6P;TEhE4?fO26?q*Mf0j|(zLm&v$t#asU?_&AJbSMVqpKf
z{nD4C$Mf~xo+#NT{%zCKli8_{UGi^U=^3x0NLpvuxL$fgner*q$7OU2DY?g62U^(Q9lLSEhlAHAJi_1lt0yG&V0+J8cG}%&%(~h~iZF^9
z6kA#%Yk##8ImgE7jZO0Qd&e8hMY|NTa9M-9yefL3o}%P3H>c!^)V}g&XX(qTLZg*F
z!dn}tNcGKZ?dPkUS$?;-Uf#WD(5qN_Im`0w4UwrUgqJ2^AW7F69vlBp1Y(
zyhQQZZiK`vw
zd#%Mz-*x!jI)}1O?rWuO&jqG`Qgx}60Z*!3;0X1?lT%a|tJUg5Ex0}@ksBIYgBl~7
zl~28V9Dwh7zsn(&Rob)}*@Xgb{I$ja<^p7hEau0$JY)d9@%{6@zgZ=oi$E}87Zo0_
zA8x*^o|@Z=6zmpEy+z7^;#$YnTeOcA!GVqr7wh4STsFaw{J_0VCy#;ZNKg+a#dXMl
zKg5$G@WhA88Z$m)B3BQ$mSzH^;9%&{Aic;rM!asQxA-*dQ|bND(T&47%RN6A4@fnK
z)|B=*F3ySbFH*tvZk0=WEZTnFn5%GHUCaA3LO6^VdLCnyBu*aWccb
zxu$HddK$9k*A|Ezav<2m{858@q`5dW)9{hQD0(f9mE~h$xD4l$kt-k_Sc7MRSL*OIJGr}8
zCHmwGU+PJp&=TQ{QA!)4Wc+5^rV$wsCj;!8h|YKGTk?`aLi8Q8VdbJf2T-ObfQ~oN
z^5%MaQ7h?DKGwLa>d=#brE~PYWloI&b%R6EwK*A|H+egqb6o`G0xtbTXVX?v$vvi;sR|M;uL`y6s8gZ(eO
zYQ|@)x4F9VJi^6wG;->~tvh}o0rF9Ti(+Z)z8i9a<|-txDJ
z@5qw@xX*^E#F{$KxR9`tNEQFW37x=dgG=dQc?XW1ZeRPzTXZ!8zad!!mwz8>z@&r?SQkbI}>YTEF|NaDHD8AX|R5c;tZg)d$eZwVGv#Wj{
aHLt>=;@r+V>qIFp&p6Mh9Mjk&>-i6Ll%8P#
literal 0
HcmV?d00001
From 6d78ce00b3fe7323e71693400c37e305182c0d2e Mon Sep 17 00:00:00 2001
From: ms group dev
Date: Wed, 30 Jan 2019 14:25:36 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/webapp/WEB-INF/manager/index.ftl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl
index f735089f..ecf78e37 100644
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@@ -57,7 +57,7 @@
-
+
From 64c5c6e077318dee84a9d7de3c48e94920bbd155 Mon Sep 17 00:00:00 2001
From: yinxr <2273460044@qq.com>
Date: Wed, 30 Jan 2019 14:34:06 +0800
Subject: [PATCH 4/7] Signed-off-by: yinxr <2273460044@qq.com>
---
src/main/webapp/WEB-INF/manager/index.ftl | 6 ++----
src/main/webapp/static/ms-admin/4.7.0/css/index.css | 2 +-
src/main/webapp/static/ms-admin/4.7.0/less/index.less | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl
index 9e588f67..199dd357 100644
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@@ -10,7 +10,6 @@
-
-
- io.springfox
- springfox-swagger2
- 2.9.2
-
-
- org.springframework
- spring-core
-
-
- org.springframework
- spring-beans
-
-
- org.springframework
- spring-context
-
-
- org.springframework
- spring-context-support
-
-
- org.springframework
- spring-aop
-
-
- org.springframework
- spring-tx
-
-
- org.springframework
- spring-orm
-
-
- org.springframework
- spring-jdbc
-
-
- org.springframework
- spring-web
-
-
- org.springframework
- spring-webmvc
-
-
- org.springframework
- spring-oxm
-
-
-
-
- io.springfox
- springfox-swagger-ui
- 2.9.2
-
ms-mcms
From 24df457a41838f9b4f957b0e81daeb56766ae4eb Mon Sep 17 00:00:00 2001
From: yinxr <2273460044@qq.com>
Date: Wed, 30 Jan 2019 18:03:21 +0800
Subject: [PATCH 6/7] =?UTF-8?q?Signed-off-by:=20=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E5=B1=95=E5=BC=80=E6=94=B6=E7=BC=A9=E5=9B=BE=E6=A0=87=E5=B1=82?=
=?UTF-8?q?=E7=BA=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/webapp/WEB-INF/manager/login.ftl | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/main/webapp/WEB-INF/manager/login.ftl b/src/main/webapp/WEB-INF/manager/login.ftl
index 05deaa14..feca8e86 100644
--- a/src/main/webapp/WEB-INF/manager/login.ftl
+++ b/src/main/webapp/WEB-INF/manager/login.ftl
@@ -8,9 +8,7 @@
-
+
From a40c4fb02efe87537fbff7b1849d274550c451d6 Mon Sep 17 00:00:00 2001
From: yinxr <2273460044@qq.com>
Date: Wed, 30 Jan 2019 18:05:55 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix=20bug=20=E5=B1=95=E5=BC=80=E6=94=B6?=
=?UTF-8?q?=E7=BC=A9=E6=8C=89=E9=92=AE=E5=B1=82=E7=BA=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/webapp/WEB-INF/manager/index.ftl | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl
index def0ff46..ef407222 100644
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@@ -11,7 +11,6 @@
-