From 2649cf364b6fc3c18f66ce4b65e4c61a8552e38a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 6 Nov 2019 14:28:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BB=E9=A2=98=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E9=98=B2=E6=AD=A2=E7=BD=91=E9=80=9F=E6=85=A2?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E5=87=BA=E7=8E=B0=E7=A9=BA=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/static/css/skins.css             | 2 +-
 .../src/main/java/com/ruoyi/system/domain/SysDictType.java      | 2 +-
 .../src/main/java/com/ruoyi/system/domain/SysLogininfor.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/css/skins.css b/ruoyi-admin/src/main/resources/static/css/skins.css
index 49d953bc..5ee8d032 100644
--- a/ruoyi-admin/src/main/resources/static/css/skins.css
+++ b/ruoyi-admin/src/main/resources/static/css/skins.css
@@ -5,7 +5,7 @@
  *
 */
 /** 蓝色主题 skin-blue **/
-.skin-blue .navbar {
+.navbar, .skin-blue .navbar {
 	background-color: #3c8dbc
 }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java
index 11de732e..8c786b4b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java
@@ -25,7 +25,7 @@ public class SysDictType extends BaseEntity
     private String dictName;
 
     /** 字典类型 */
-    @Excel(name = "字典类型 ")
+    @Excel(name = "字典类型")
     private String dictType;
 
     /** 状态（0正常 1停用） */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
index 98a39cdc..cf79d99d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
@@ -41,7 +41,7 @@ public class SysLogininfor extends BaseEntity
     private String browser;
 
     /** 操作系统 */
-    @Excel(name = "操作系统 ")
+    @Excel(name = "操作系统")
     private String os;
 
     /** 提示消息 */