Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1

# Conflicts:
#	nezha-fronted/src/components/common/language/cn.js
#	nezha-fronted/src/components/common/language/en.js

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

@@ -163,7 +163,9 @@ const en = {
     normal: 'Up',
     unusual: 'Down',
     AuthenticationFailed: 'Authentication failed',
-    clearAllSelect: 'Clear the selection'
+    clearAllSelect: 'Clear the selection',
+    disabled: 'Disabled',
+    enabled: 'Enabled'
   },
   pageSize: '/page',
   setup: {
@@ -733,6 +735,7 @@ const en = {
     user: {
       userList: 'User list', // "用户列表"
       user: 'User',
+      state: 'State',
       // 列表表头
       name: 'Name', // "用户"
       username: 'Username', // 登录名