From b073384fc71dc021b77623db63ed16f5e45947d8 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 18 May 2022 14:46:36 +0800
Subject: [PATCH] solve conflict

---
 pc4mobx/organization/public/i18n.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pc4mobx/organization/public/i18n.js b/pc4mobx/organization/public/i18n.js
index e917510..d4230b6 100644
--- a/pc4mobx/organization/public/i18n.js
+++ b/pc4mobx/organization/public/i18n.js
@@ -128,6 +128,7 @@ export const i18n = {
 		newOfficeName: () => getLabel(386246, '新建职务信息'),
 		editOfficeName: () => getLabel(386247, '编辑职务信息'),
 		newOfficeClassifyName: () => getLabel(386246, '新建职务分类信息'),
+		branchNumSetting: () => getLabel(386246, '分部编号设置'),
 		companyName: () => getLabel(385936, '分部'),