solve conflict
This commit is contained in:
parent
98ae042c26
commit
b073384fc7
|
|
@ -128,6 +128,7 @@ export const i18n = {
|
|||
newOfficeName: () => getLabel(386246, '新建职务信息'),
|
||||
editOfficeName: () => getLabel(386247, '编辑职务信息'),
|
||||
newOfficeClassifyName: () => getLabel(386246, '新建职务分类信息'),
|
||||
branchNumSetting: () => getLabel(386246, '分部编号设置'),
|
||||
companyName: () => getLabel(385936, '分部'),
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue