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/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -574,7 +574,8 @@ const en = {
      inputConfirmPwd:'Please input confirm password',
      invalidPwd:'invalide password,the length at least 6',
      confirmPwdErr:'The two passwords are inconsistent',
-      reinputPwd:'Enter password again'
+      reinputPwd:'Enter password again',
+      notification: 'Notification'
    },
    promServer: {
      promServerList: 'Prometheus server',//"Prometheus Server"