Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow

web/src/view/dashboard/index.vue

@@ -6,7 +6,7 @@
                     <span class="card-img"> <img :src="userInfo.headerImg"  alt="" > </span>   
                     <div class="text"><h4>早安，管理员， 请开始您一天的工作吧！</h4>
                         <p class="tips-text">
-                            <i class="el-icon-sunny"></i>
+                            <i class="el-icon-sunny el-icon"></i>
                             <span>今日晴，0℃ - 10℃，天气寒冷，注意添加衣物。</span>
                         </p>
                     </div>

web/src/view/example/simpleUploader/simpleUploader.vue

@@ -147,7 +147,7 @@ export default {
 .uploader-example {
   width: 880px;
   padding: 15px;
-  margin: 40px auto 0;
+  margin: 115px 15px 20px;
   font-size: 12px;
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.4);
 }