solve conflict

This commit is contained in:
Chengliang 2022-05-18 14:46:36 +08:00
parent 98ae042c26
commit b073384fc7
1 changed files with 1 additions and 0 deletions

View File

@ -128,6 +128,7 @@ export const i18n = {
newOfficeName: () => getLabel(386246, '新建职务信息'),
editOfficeName: () => getLabel(386247, '编辑职务信息'),
newOfficeClassifyName: () => getLabel(386246, '新建职务分类信息'),
branchNumSetting: () => getLabel(386246, '分部编号设置'),
companyName: () => getLabel(385936, '分部'),