Merge branch 'develop' of https://github.com/TaleLin/lin-cms-vue into multiple-input

Author: vanoneang

src/components/layout/User.vue

@@ -367,6 +367,7 @@ export default {
 }
 
 .user {
+  height: 40px;
   .el-dropdown-link {
     cursor: pointer;