fix conflict

This commit is contained in:
yoan
2024-10-01 07:04:40 +08:00
15 changed files with 145 additions and 64 deletions

View File

@@ -21,6 +21,7 @@
"cancel": "取消",
"confirm": "确认",
"edit": "编辑",
"copy": "复制",
"succeed": "成功",
"add": "新增",
"document": "文档",
@@ -154,6 +155,8 @@
"access.management": "授权管理",
"access.add": "添加授权",
"access.edit": "编辑授权",
"access.copy": "复制授权",
"access.delete.confirm": "确定要删除授权吗?",
"access.all": "所有授权",
"access.list": "授权列表",
"access.type": "服务商",