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

# Conflicts: # nezha-fronted/src/components/common/header.vue
2019-12-26 17:30:10 +08:00
parent 057e4ece33 9713286f34
commit 5e97fd3689
31 changed files with 2851 additions and 3181 deletions
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -559,9 +559,6 @@ export default {
 }
 </script>
 <style>
-.el-table {
-    font-size: 10px;
-}

 .el-popover {
    padding: 0;