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

# Conflicts:
#	nezha-fronted/config/index.js
#	nezha-fronted/src/components/common/language/cn.js
#	nezha-fronted/src/http.js

nezha-fronted/src/components/common/language/cn.js

@@ -1,10 +1,16 @@
 import zhLocale from 'element-ui/lib/locale/lang/zh-CN' //引入element语言包
 const cn = {
-  overall: {
-    dashboard: '仪表盘',
-    project: '工程',
-    asset: '资产',
-    alarm: '警告'
+  overall:{
+    dashboard:'仪表盘',
+    project:'工程',
+    asset:'资产',
+    create: '新增',
+    edit: '修改',
+    delete: '删除',
+    esc: '取消',
+    cancel: '取消',
+    save: '保存',
+    search: '搜索'
   },
   asset: {
     tableTitle: {
@@ -30,7 +36,24 @@ const cn = {
       alarm: 'Alarm',
     },
   },
+  config: {
+    account: {
+      //列表表头
+      account: "用户",
+      language: "语言",
+      receiver: "用户组",
+      createTime: "创建时间",
+      enable: "可用",
+      option: "操作",
+
+      //侧滑框
+      accountId: "用户ID",
+      createAccount: "新增用户",
+      editAccount: "修改用户",
+      notCurrentlySupport: '暂不支持'
+    }
+  },
   ...zhLocale
 }
 
-export default cn;
+export default cn;