Merge branch 'master' into test_zyh

src/components/ContainerStatus/src/ContainerStatus.vue

@@ -102,7 +102,8 @@ watch(
     }
   }
   .footer {
-    line-height: 38px;
+    // line-height: 38px;
+    padding: 12px 0;
     color: #999;
     font-size: 12px;
     text-align: center;