Merge branch 'notification' into codeCheck

# Conflicts: # nezha-fronted/src/components/page/config/account.vue
2020-11-21 18:03:06 +08:00
parent 092a547f6d a21ddd47ae
commit d58f36fa19
4 changed files with 179 additions and 21 deletions
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -570,7 +570,8 @@ const cn = {
      inputConfirmPwd: "请再次输入密码",
      invalidPwd: "无效的密码，最少6个字符",
      confirmPwdErr: "两次密码输入不一致",
-      reinputPwd: "请再次输入密码"
+      reinputPwd: "请再次输入密码",
+      notification: "通知"
    },
    promServer: {
      promServerList: "Prometheus服务",