Merge remote-tracking branch 'origin/v4' into v4

2 years ago · 830a162982
2 changed files with 5 additions and 0 deletions
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/newsty.css
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/newsty.css
@ -129,6 +129,11 @@ body {
    background: url(../img/icontop_htgl.png);
 }
 .nav_zfjd {
    background: url(../img/icontop_zfjd.png);
 }
 /*********** left icon **********/
 /*
 .leftmenu_case {
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/img/icontop_zfjd.png
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/img/icontop_zfjd.png