Merge branch 'master' of https://git.nuttyreading.com/wangjinlei/tougao_web into Editorial-Board

2026-03-18 10:35:43 +08:00
parent 94d45dfddf 577a30aeb6
commit 4f0b95d7bb
9 changed files with 1131 additions and 578 deletions
--- a/src/components/common/langs/zh.js
+++ b/src/components/common/langs/zh.js
@@ -257,9 +257,13 @@ const zh = {
 		emailStyles: '邮件风格',
 		tools: '辅助工具',
 		mailboxManagement: '邮箱管理',
+<<<<<<< HEAD
 		mailboxConfig: '邮箱配置管理',
 		mailboxCollect: '邮箱列表',
 		scholarCrawlers: '学者抓取',
+=======
+		scholarCrawlers: '学者数据库',
+>>>>>>> 577a30aeb65a03b5b8b229e5b6a974645e171a0c
 		ReArticles: '被拒稿件',     // 被拒稿件
 		editorialBoard: '编委管理',
 		editorialBoard1: '编委列表',