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

2020-04-28 23:04:14 +08:00
parent d61e9458bb 5343b9f5a1
commit 8e6e49647d
10 changed files with 954 additions and 25 deletions
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -555,7 +555,11 @@ const en = {
      cabinetNum: "Cabinet number",
      assets: "Assets",
      remark:'Remark',
-      cabinets: "Cabinets"
+      cabinets: "Cabinets",
+      traffic:{
+        title:'Traffic Setting',
+        add:'Add',
+      }
    },
    model: {
      model: 'Asset model',