diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1328ed48..b835687d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # 版本发布日志
 
+## 2.2407.1-20240704
+
+- 修复 网元版本安装MME修改S6A地址为MME_IP
+- 修复 网元公共参数n3/n6IP不携带/子网掩码处理异常
+- 更新 初始网元主机用omcuser/a9tU53r用密码登录方式
+- 更新 omc/log/内的level为warn
+- 更新 MML-OMC隐藏NBI配置项
+- 更新 多语言UE事件改为终端事件/CNType改5G&4G
+- 更新 多语言CDR翻译命名Voice CDR / Data CDR
+
 ## 2.2406.4-20240627
 
 - 更新 关闭crontask任务异常TaskHandShakeToNF
diff --git a/database/common/mml_command.sql b/database/common/mml_command.sql
index 0cc81323..f95f7440 100644
--- a/database/common/mml_command.sql
+++ b/database/common/mml_command.sql
@@ -55,7 +55,7 @@ INSERT INTO `mml_command` VALUES (1606, 'OMC', 'licenseManagement', 'License Man
 INSERT INTO `mml_command` VALUES (1607, 'OMC', 'licenseManagement', 'License Management', 'exp', 'license', 'Export NE License', '[{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"name\":\"netype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"ne_id\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE ID\",\"filter\":\"\",\"name\":\"neid\",\"optional\":\"true\",\"type\":\"string\"}]', 'Inactive');
 INSERT INTO `mml_command` VALUES (1608, 'OMC', 'licenseManagement', 'License Management', 'uni', 'license', 'Uninstall NE License', '[{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"name\":\"netype\",\"optional\":\"false\",\"type\":\"string\"},{\"alias\":\"ne_id\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE ID\",\"filter\":\"\",\"name\":\"neid\",\"optional\":\"false\",\"type\":\"string\"}]', 'Inactive');
 INSERT INTO `mml_command` VALUES (1609, 'OMC', 'licenseManagement', 'License Management', 'dsp', 'nelink', 'Display NE Interface Link Status', '[{\"alias\":\"ne_type\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"name\":\"netype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"ne_id\",\"comment\":\"\",\"display\":\"NE ID\",\"filter\":\"\",\"name\":\"neid\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"interface\",\"comment\":\"\",\"display\":\"Interface\",\"filter\":\"\",\"name\":\"interface\",\"optional\":\"true\",\"type\":\"string\"}]', 'Inactive');
-INSERT INTO `mml_command` VALUES (1610, 'OMC', 'nrmManagement', 'NBI Resources Management', 'dsp', 'nbicm', 'Display NBI Resources Management', '[{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"name\":\"netype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"ne_id\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE ID\",\"filter\":\"\",\"name\":\"neid\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"rm_uid\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Resource management UID\",\"filter\":\"\",\"name\":\"rmuid\",\"optional\":\"true\",\"type\":\"string\"}]', 'Active');
+INSERT INTO `mml_command` VALUES (1610, 'OMC', 'nrmManagement', 'NBI Resources Management', 'dsp', 'nbicm', 'Display NBI Resources Management', '[{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"name\":\"netype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"ne_id\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE ID\",\"filter\":\"\",\"name\":\"neid\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"rm_uid\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Resource management UID\",\"filter\":\"\",\"name\":\"rmuid\",\"optional\":\"true\",\"type\":\"string\"}]', 'Inactive');
 INSERT INTO `mml_command` VALUES (1611, 'OMC', 'neVersionManagement', 'NE Version Management', 'upg', 'neversion', 'Upgrade NE Software Version', '[{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"netype\",\"optional\":\"false\",\"type\":\"string\"},{\"alias\":\"ne_id\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"neid\",\"optional\":\"false\",\"type\":\"string\"},{\"alias\":\"version\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Version\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"version\",\"optional\":\"false\",\"type\":\"string\"}]', 'Inactive');
 INSERT INTO `mml_command` VALUES (1612, 'OMC', 'pmTaskManagement', 'Performance Measure Task Management', 'lst', 'measuretask', 'List Performance Measure Task', '[{\"alias\":\"id\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Task ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"id\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"name\":\"netype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"granul_option\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Time granularity\",\"filter\":\"\",\"name\":\"granuloption\",\"optional\":\"true\",\"type\":\"string\"}]', 'Active');
 INSERT INTO `mml_command` VALUES (1613, 'OMC', 'pmTaskManagement', 'Performance Measure Task Management', 'add', 'measuretask', 'Add Performance Measure Task', '[{\"alias\":\"ne_type\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"loc\":\"false\",\"name\":\"netype\",\"optional\":\"false\",\"type\":\"string\"},{\"alias\":\"ne_ids\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"NE ID set\",\"filter\":\"\",\"loc\":\"false\",\"name\":\"neids\",\"optional\":\"false\",\"type\":\"array\"},{\"alias\":\"granul_option\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Granularity option\",\"filter\":\"\",\"loc\":\"false\",\"name\":\"granuloption\",\"optional\":\"false\",\"type\":\"string\"},{\"alias\":\"kpi_set\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"KPI set\",\"filter\":\"\",\"loc\":\"false\",\"name\":\"kpiset\",\"optional\":\"false\",\"type\":\"json\"},{\"alias\":\"start_time\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Measure task start time\",\"filter\":\"\",\"loc\":\"false\",\"name\":\"starttime\",\"optional\":\"false\",\"type\":\"string\"},{\"alias\":\"end_time\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Measure task end time\",\"filter\":\"\",\"loc\":\"false\",\"name\":\"endtime\",\"optional\":\"false\",\"type\":\"string\"}]', 'Active');
diff --git a/database/install/ne_host.sql b/database/install/ne_host.sql
index efe20538..5f3b28cb 100644
--- a/database/install/ne_host.sql
+++ b/database/install/ne_host.sql
@@ -30,34 +30,34 @@ CREATE TABLE `ne_host`  (
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '网元主机表' ROW_FORMAT = DYNAMIC;
 
 -- 初始数据对应网元
-INSERT INTO `ne_host` VALUES (1, 'ssh', '1', 'OMC_001_22', '127.0.0.1', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (1, 'ssh', '1', 'OMC_001_22', '127.0.0.1', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (2, 'telnet', '1', 'OMC_001_4100', '127.0.0.1', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (3, 'ssh', '1', 'IMS_001_22', '172.16.5.110', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708314682742, NULL, 0);
+INSERT INTO `ne_host` VALUES (3, 'ssh', '1', 'IMS_001_22', '172.16.5.110', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708314682742, NULL, 0);
 INSERT INTO `ne_host` VALUES (4, 'telnet', '1', 'IMS_001_4100', '172.16.5.110', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (5, 'ssh', '1', 'AMF_001_22', '172.16.5.120', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708314682742, NULL, 0);
+INSERT INTO `ne_host` VALUES (5, 'ssh', '1', 'AMF_001_22', '172.16.5.120', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708314682742, NULL, 0);
 INSERT INTO `ne_host` VALUES (6, 'telnet', '1', 'AMF_001_4100', '172.16.5.120', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (7, 'ssh', '1', 'AUSF_001_22', '172.16.5.130', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (7, 'ssh', '1', 'AUSF_001_22', '172.16.5.130', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (8, 'telnet', '1', 'AUSF_001_4100', '172.16.5.130', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (9, 'ssh', '1', 'UDM_001_22', '172.16.5.140', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (9, 'ssh', '1', 'UDM_001_22', '172.16.5.140', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (10, 'telnet', '1', 'UDM_001_4100', '172.16.5.140', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (11, 'ssh', '1', 'SMF_001_22', '172.16.5.150', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (11, 'ssh', '1', 'SMF_001_22', '172.16.5.150', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (12, 'telnet', '1', 'SMF_001_4100', '172.16.5.150', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (13, 'ssh', '1', 'PCF_001_22', '172.16.5.160', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (13, 'ssh', '1', 'PCF_001_22', '172.16.5.160', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (14, 'telnet', '1', 'PCF_001_4100', '172.16.5.160', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (15, 'ssh', '1', 'NSSF_001_22', '172.16.5.170', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (15, 'ssh', '1', 'NSSF_001_22', '172.16.5.170', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (16, 'telnet', '1', 'NSSF_001_4100', '172.16.5.170', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (17, 'ssh', '1', 'NRF_001_22', '172.16.5.180', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (17, 'ssh', '1', 'NRF_001_22', '172.16.5.180', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (18, 'telnet', '1', 'NRF_001_4100', '172.16.5.180', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (19, 'ssh', '1', 'UPF_001_22', '172.16.5.190', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (19, 'ssh', '1', 'UPF_001_22', '172.16.5.190', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (20, 'telnet', '1', 'UPF_001_4100', '172.16.5.190', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (21, 'telnet', '1', 'UPF_001_5002', '172.16.5.190', 5002, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (22, 'ssh', '1', 'LMF_001_22', '172.16.5.200', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (22, 'ssh', '1', 'LMF_001_22', '172.16.5.200', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (23, 'telnet', '1', 'LMF_001_4100', '172.16.5.200', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (24, 'ssh', '1', 'NEF_001_22', '172.16.5.210', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (24, 'ssh', '1', 'NEF_001_22', '172.16.5.210', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (25, 'telnet', '1', 'NEF_001_4100', '172.16.5.210', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (26, 'ssh', '1', 'MME_001_22', '172.16.5.220', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (26, 'ssh', '1', 'MME_001_22', '172.16.5.220', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (27, 'telnet', '1', 'MME_001_4100', '172.16.5.220', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (28, 'ssh', '1', 'N3IWF_001_22', '172.16.5.230', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (28, 'ssh', '1', 'N3IWF_001_22', '172.16.5.230', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (29, 'telnet', '1', 'N3IWF_001_4100', '172.16.5.230', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
 
 SET FOREIGN_KEY_CHECKS=1;
diff --git a/database/install/sys_dict_data1_i18n_zh.sql b/database/install/sys_dict_data1_i18n_zh.sql
index 6599ef24..60b682d1 100644
--- a/database/install/sys_dict_data1_i18n_zh.sql
+++ b/database/install/sys_dict_data1_i18n_zh.sql
@@ -342,13 +342,13 @@ INSERT INTO `sys_dict_data` VALUES (1722, 1722, 'job.errTargetParams', '操作
 INSERT INTO `sys_dict_data` VALUES (1723, 1723, 'job.errCronExpression', '操作调度任务【{name}】失败，Cron表达式不正确', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (1724, 1724, 'job.errJobExists', '调度任务新增【{name}】失败，同任务组内有相同任务名称', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (1725, 1725, 'job.statusEq', '变更状态与旧值相等！', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (1750, 1750, 'role.admin', '超级管理员', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (1751, 1751, 'role.adminAssign', '管理人员', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (1750, 1750, 'role.system', '系统', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (1751, 1751, 'role.admin', '管理人员', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (1752, 1752, 'role.operator', '运维人员', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (1753, 1753, 'role.monitor', '监控人员', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (1754, 1754, 'role.vistor', '普通用户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (1755, 1755, 'role.adminRemark', '超级管理员，无法修改删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (1756, 1756, 'role.adminAssignRemark', '管理人员 可以对设备进行任何操作', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (1755, 1755, 'role.systemRemark', '系统，无法修改删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (1756, 1756, 'role.adminRemark', '管理人员 可以对设备进行任何操作', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (1757, 1757, 'role.operatorRemark', '运维人员 可以从设备读取数据，并对设备进行配置，但是不能对设备进行软件升级操作。', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (1758, 1758, 'role.monitorRemark', '监控人员 只能从设备读取数据，而不能对设备进行任何设置', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (1759, 1759, 'role.vistorRemark', '普通用户 只可看系统相关信息', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
@@ -542,7 +542,7 @@ INSERT INTO `sys_dict_data` VALUES (2031, 2031, 'sys.account.captchaType', '账
 INSERT INTO `sys_dict_data` VALUES (2032, 2032, 'sys.account.captchaTypeRemark', '使用验证码类型（math数值计算，char字符验证）', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (2033, 2033, 'menu.dashboard', '仪表盘', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (2034, 2034, 'menu.dashboard.overview', '总览', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (2035, 2035, 'menu.dashboard.imsCDR', 'IMS 话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (2035, 2035, 'menu.dashboard.imsCDR', '通话话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (2036, 2036, 'dictType.cdr_sip_code', 'CDR SIP响应代码类别类型', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (2037, 2037, 'dictType.cdr_call_type', 'CDR 呼叫类型', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (2038, 2038, 'dictType.ue_auth_code', 'UE 事件认证代码类型', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
@@ -615,9 +615,9 @@ INSERT INTO `sys_dict_data` VALUES (2104, 2104, 'menu.config.neInfo', '网元信
 INSERT INTO `sys_dict_data` VALUES (2105, 2105, 'log.operate.title.neInfo', '网元信息', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2106, 2106, 'neInfo.noData', '没有可访问网元信息数据！', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2107, 2107, 'neInfo.errKeyExists', '网元信息操作【{key}】失败，同类型下标识已存在', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (2108, 2108, 'log.operate.title.imsCDR', 'IMS-CDR会话', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (2109, 2109, 'menu.dashboard.amfUE', '5G UE事件', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (2110, 2110, 'log.operate.title.amfUE', '5G UE事件', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (2108, 2108, 'log.operate.title.imsCDR', '通话话单', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (2109, 2109, 'menu.dashboard.amfUE', '5G 终端事件', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (2110, 2110, 'log.operate.title.amfUE', '5G 终端事件', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2111, 2111, 'dictData.ne_info_status.0', '离线', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2112, 2112, 'dictData.ne_info_status.1', '在线', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2113, 2113, 'dictData.ne_info_status.2', '等待同步', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
@@ -646,18 +646,18 @@ INSERT INTO `sys_dict_data` VALUES (2135, 2135, 'dictData.ne_version_status.1',
 INSERT INTO `sys_dict_data` VALUES (2136, 2136, 'dictData.ne_version_status.2', '上一版本', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2137, 2137, 'dictData.ne_version_status.3', '有新版本', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2138, 2138, 'menu.fault.event', '事件通知', 'i18n_zh', '', '', '1', 'supervisor', 1717051745866, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (2139, 2139, 'menu.dashboard.smfCDR', 'SMF 话单', 'i18n_zh', '', '', '1', 'supervisor', 1717051745866, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (2140, 2140, 'log.operate.title.smfCDR', 'SMF-CDR会话', 'i18n_zh', '', '', '1', 'supervisor', 1717051745866, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (2139, 2139, 'menu.dashboard.smfCDR', '数据话单', 'i18n_zh', '', '', '1', 'supervisor', 1717051745866, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (2140, 2140, 'log.operate.title.smfCDR', '数据话单', 'i18n_zh', '', '', '1', 'supervisor', 1717051745866, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2141, 2141, 'config.sys.i18nDefaultRemark', '国际化默认语言可选择 en_US、zh_CN', 'i18n_zh', '', '', '1', 'supervisor', 1717051745866, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2142, 2142, 'config.sys.i18nOpenRemark', '是否显示切换的控件 true/false', 'i18n_zh', '', '', '1', 'supervisor', 1717051745866, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (2143, 2143, 'menu.dashboard.mmeUE', '4G UE事件', 'i18n_zh', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (2144, 2144, 'log.operate.title.mmeUE', '4G UE事件', 'i18n_zh', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (2143, 2143, 'menu.dashboard.mmeUE', '4G 终端事件', 'i18n_zh', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (2144, 2144, 'log.operate.title.mmeUE', '4G 终端事件', 'i18n_zh', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2145, 2145, 'menu.system.user.editPost', '修改用户岗位', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (2146, 2146, 'dictType.udm_sub_cn_type', 'UDM Sub CN Type', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (2147, 2147, 'dictData.udm_sub_cn_type.0', '没有5GC和EPC', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (2148, 2148, 'dictData.udm_sub_cn_type.1', '5GC', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (2149, 2149, 'dictData.udm_sub_cn_type.2', 'EPC', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (2150, 2150, 'dictData.udm_sub_cn_type.3', '5GC和EPC', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (2147, 2147, 'dictData.udm_sub_cn_type.0', 'No 5G&4G', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (2148, 2148, 'dictData.udm_sub_cn_type.1', '5G', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (2149, 2149, 'dictData.udm_sub_cn_type.2', '4G', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (2150, 2150, 'dictData.udm_sub_cn_type.3', '5G&4G', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 
 -- 多租户
 INSERT INTO `sys_dict_data` VALUES (11000, 11000, 'menu.security.tenant', '租户管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
diff --git a/database/install/sys_dict_data2_i18n_en.sql b/database/install/sys_dict_data2_i18n_en.sql
index 44b5417d..41b5e3e0 100644
--- a/database/install/sys_dict_data2_i18n_en.sql
+++ b/database/install/sys_dict_data2_i18n_en.sql
@@ -342,13 +342,13 @@ INSERT INTO `sys_dict_data` VALUES (3722, 3722, 'job.errTargetParams', 'Failed t
 INSERT INTO `sys_dict_data` VALUES (3723, 3723, 'job.errCronExpression', 'Scheduled task [{name}] failed with incorrect Cron expression!', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (3724, 3724, 'job.errJobExists', 'Failed to add a new task [{name}] to a scheduling task, same task name in the same task group', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (3725, 3725, 'job.statusEq', 'The change state is equal to the old value!', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (3750, 3750, 'role.admin', 'Super Administrator', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (3751, 3751, 'role.adminAssign', 'Managers', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (3750, 3750, 'role.system', 'System', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (3751, 3751, 'role.admin', 'Administrator', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (3752, 3752, 'role.operator', 'Operators', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (3753, 3753, 'role.monitor', 'Monitor', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (3754, 3754, 'role.vistor', 'General Users', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (3755, 3755, 'role.adminRemark', 'Super Administrator, cannot modify or delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (3756, 3756, 'role.adminAssignRemark', 'Administrators can perform any operation on the device', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (3755, 3755, 'role.systemRemark', 'System, cannot modify or delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (3756, 3756, 'role.adminRemark', 'Administrators can perform any operation on the device', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (3757, 3757, 'role.operatorRemark', 'Operation and maintenance personnel can read data from the device and configure the device, but cannot perform software upgrade operations on the device.', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (3758, 3758, 'role.monitorRemark', 'Monitoring personnel Can only read data from the device, but cannot make any settings on the device', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (3759, 3759, 'role.vistorRemark', 'Ordinary users can only see system-related information', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
@@ -542,7 +542,7 @@ INSERT INTO `sys_dict_data` VALUES (4031, 4031, 'sys.account.captchaType', 'Acco
 INSERT INTO `sys_dict_data` VALUES (4032, 4032, 'sys.account.captchaTypeRemark', 'Using CAPTCHA types (math numeric calculation, char character validation)', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (4033, 4033, 'menu.dashboard', 'Dashboard', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (4034, 4034, 'menu.dashboard.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (4035, 4035, 'menu.dashboard.imsCDR', 'IMS CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (4035, 4035, 'menu.dashboard.imsCDR', 'Voice CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (4036, 4036, 'dictType.cdr_sip_code', 'CDR SIP Response Code Category Type', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (4037, 4037, 'dictType.cdr_call_type', 'CDR Call Type', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (4038, 4038, 'dictType.ue_auth_code', 'UE Event Authentication Code Type', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
@@ -615,7 +615,7 @@ INSERT INTO `sys_dict_data` VALUES (4104, 4104, 'menu.config.neInfo', 'NE Info',
 INSERT INTO `sys_dict_data` VALUES (4105, 4105, 'log.operate.title.neInfo', 'NE Info', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4106, 4106, 'neInfo.noData', 'There is no accessible network element information data!', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4107, 4107, 'neInfo.errKeyExists', 'NE info operation [{key}] failed, identifier already exists under the same type', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (4108, 4108, 'log.operate.title.imsCDR', 'IMS-CDR session', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (4108, 4108, 'log.operate.title.imsCDR', 'Voice CDR', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4109, 4109, 'menu.dashboard.amfUE', '5G UE Events', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4110, 4110, 'log.operate.title.amfUE', '5G UE Events', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4111, 4111, 'dictData.ne_info_status.0', 'Offline', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
@@ -646,18 +646,18 @@ INSERT INTO `sys_dict_data` VALUES (4135, 4135, 'dictData.ne_version_status.1',
 INSERT INTO `sys_dict_data` VALUES (4136, 4136, 'dictData.ne_version_status.2', 'Previous', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4137, 4137, 'dictData.ne_version_status.3', 'Has New', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4138, 4138, 'menu.fault.event', 'Event Notification', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (4139, 4139, 'menu.dashboard.smfCDR', 'SMF CDR', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (4140, 4140, 'log.operate.title.smfCDR', 'SMF-CDR session', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (4139, 4139, 'menu.dashboard.smfCDR', 'Data CDR', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (4140, 4140, 'log.operate.title.smfCDR', 'Data CDR', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4141, 4141, 'config.sys.i18nDefaultRemark', 'Internationalization default language selectable en_US、zh_CN', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4142, 4142, 'config.sys.i18nOpenRemark', 'Whether to display switched controls true/false', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4143, 4143, 'menu.dashboard.mmeUE', '4G UE Events', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4144, 4144, 'log.operate.title.mmeUE', '4G UE Events', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4145, 4145, 'menu.system.user.editPost', 'Modify User Post', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
 INSERT INTO `sys_dict_data` VALUES (4146, 4146, 'dictType.udm_sub_cn_type', 'UDM Sub CN Type', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (4147, 4147, 'dictData.udm_sub_cn_type.0', 'No 5GC and EPC', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (4148, 4148, 'dictData.udm_sub_cn_type.1', '5GC', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (4149, 4149, 'dictData.udm_sub_cn_type.2', 'EPC', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
-INSERT INTO `sys_dict_data` VALUES (4150, 4150, 'dictData.udm_sub_cn_type.3', '5GC and EPC', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (4147, 4147, 'dictData.udm_sub_cn_type.0', 'No 5G&4G', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (4148, 4148, 'dictData.udm_sub_cn_type.1', '5G', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (4149, 4149, 'dictData.udm_sub_cn_type.2', '4G', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
+INSERT INTO `sys_dict_data` VALUES (4150, 4150, 'dictData.udm_sub_cn_type.3', '5G&4G', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
 
 -- 多租户
 INSERT INTO `sys_dict_data` VALUES (14000, 14000, 'menu.security.tenant', 'Tenant Management', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
diff --git a/database/install/sys_role.sql b/database/install/sys_role.sql
index 67064c61..5108d884 100644
--- a/database/install/sys_role.sql
+++ b/database/install/sys_role.sql
@@ -39,13 +39,16 @@ CREATE TABLE `sys_role`  (
   PRIMARY KEY (`role_id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 121 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色信息表' ROW_FORMAT = Dynamic;
 
--- ----------------------------
--- Records of sys_role
--- ----------------------------
-INSERT INTO `sys_role` VALUES (1, 'role.admin', 'supervisor', 1, '1', '1', '1', '1', '0', 'supervisor', 1697091437683, NULL, 0, 'role.adminRemark');
-INSERT INTO `sys_role` VALUES (2, 'role.adminAssign', 'administrator', 2, '1', '1', '1', '1', '0', 'supervisor', 1698486915894, 'supervisor', 1718700124398, '');
-INSERT INTO `sys_role` VALUES (3, 'role.operator', 'operator', 3, '1', '1', '1', '1', '0', 'supervisor', 1698486934900, 'supervisor', 1712917882228, 'role.operatorRemark');
-INSERT INTO `sys_role` VALUES (4, 'role.monitor', 'monitor', 4, '1', '1', '1', '1', '0', 'supervisor', 1698486950714, 'supervisor', 1712917909145, 'role.monitorRemark');
+--
+-- Dumping data for table `sys_role`
+--
+
+LOCK TABLES `sys_role` WRITE;
+
+INSERT INTO `sys_role` VALUES (1, 'role.system', 'system', 1, '1', '1', '1', '1', '0', 'supervisor', 1697091437683, 'supervisor', 1697091437683, 'role.systemRemark');
+INSERT INTO `sys_role` VALUES (2, 'role.admin', 'admin', 2, '1', '1', '1', '1', '0', 'supervisor', 1698486915894, 'supervisor', 1717143830709, 'role.adminRemark');
+INSERT INTO `sys_role` VALUES (3, 'role.operator', 'operator', 3, '1', '1', '1', '1', '0', 'supervisor', 1698486934900, 'supervisor', 1717143582784, 'role.operatorRemark');
+INSERT INTO `sys_role` VALUES (4, 'role.monitor', 'monitor', 4, '1', '1', '1', '1', '0', 'supervisor', 1698486950714, 'supervisor', 1706774389300, 'role.monitorRemark');
 INSERT INTO `sys_role` VALUES (5, 'role.vistor', 'vistor', 5, '1', '1', '1', '1', '0', 'supervisor', 1698486975779, 'supervisor', 1706774405096, 'role.vistorRemark');
 INSERT INTO `sys_role` VALUES (100, 'role.tenant', 'tenant', 100, '2', '1', '1', '1', '0', 'admin', 1715591950609, 'supervisor', 1718701342318, '');
 
diff --git a/database/upgrade/upg_sys_dict_data1_i18n_zh.sql b/database/upgrade/upg_sys_dict_data1_i18n_zh.sql
index ee5ae24d..aba403ac 100644
--- a/database/upgrade/upg_sys_dict_data1_i18n_zh.sql
+++ b/database/upgrade/upg_sys_dict_data1_i18n_zh.sql
@@ -349,13 +349,13 @@ REPLACE INTO `sys_dict_data` VALUES (1722, 1722, 'job.errTargetParams', '操作
 REPLACE INTO `sys_dict_data` VALUES (1723, 1723, 'job.errCronExpression', '操作调度任务【{name}】失败，Cron表达式不正确', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1724, 1724, 'job.errJobExists', '调度任务新增【{name}】失败，同任务组内有相同任务名称', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1725, 1725, 'job.statusEq', '变更状态与旧值相等！', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (1750, 1750, 'role.admin', '超级管理员', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (1751, 1751, 'role.adminAssign', '管理人员', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (1750, 1750, 'role.system', '系统', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (1751, 1751, 'role.admin', '管理人员', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1752, 1752, 'role.operator', '运维人员', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1753, 1753, 'role.monitor', '监控人员', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1754, 1754, 'role.vistor', '普通用户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (1755, 1755, 'role.adminRemark', '超级管理员，无法修改删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (1756, 1756, 'role.adminAssignRemark', '管理人员 可以对设备进行任何操作', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (1755, 1755, 'role.systemRemark', '系统，无法修改删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (1756, 1756, 'role.adminRemark', '管理人员 可以对设备进行任何操作', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1757, 1757, 'role.operatorRemark', '运维人员 可以从设备读取数据，并对设备进行配置，但是不能对设备进行软件升级操作。', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1758, 1758, 'role.monitorRemark', '监控人员 只能从设备读取数据，而不能对设备进行任何设置', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (1759, 1759, 'role.vistorRemark', '普通用户 只可看系统相关信息', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
@@ -549,7 +549,7 @@ REPLACE INTO `sys_dict_data` VALUES (2031, 2031, 'sys.account.captchaType', '账
 REPLACE INTO `sys_dict_data` VALUES (2032, 2032, 'sys.account.captchaTypeRemark', '使用验证码类型（math数值计算，char字符验证）', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (2033, 2033, 'menu.dashboard', '仪表盘', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (2034, 2034, 'menu.dashboard.overview', '总览', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (2035, 2035, 'menu.dashboard.imsCDR', 'IMS 话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (2035, 2035, 'menu.dashboard.imsCDR', '通话话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (2036, 2036, 'dictType.cdr_sip_code', 'CDR SIP响应代码类别类型', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (2037, 2037, 'dictType.cdr_call_type', 'CDR 呼叫类型', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (2038, 2038, 'dictType.ue_auth_code', 'UE 事件认证代码类型', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
@@ -622,9 +622,9 @@ REPLACE INTO `sys_dict_data` VALUES (2104, 2104, 'menu.config.neInfo', '网元
 REPLACE INTO `sys_dict_data` VALUES (2105, 2105, 'log.operate.title.neInfo', '网元信息', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2106, 2106, 'neInfo.noData', '没有可访问网元信息数据！', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2107, 2107, 'neInfo.errKeyExists', '网元信息操作【{key}】失败，同类型下标识已存在', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (2108, 2108, 'log.operate.title.imsCDR', 'IMS-CDR会话', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (2109, 2109, 'menu.dashboard.amfUE', '5G UE事件', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (2110, 2110, 'log.operate.title.amfUE', '5G UE事件', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2108, 2108, 'log.operate.title.imsCDR', '通话话单', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2109, 2109, 'menu.dashboard.amfUE', '5G 终端事件', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2110, 2110, 'log.operate.title.amfUE', '5G 终端事件', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2111, 2111, 'dictData.ne_info_status.0', '离线', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2112, 2112, 'dictData.ne_info_status.1', '在线', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2113, 2113, 'dictData.ne_info_status.2', '等待同步', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
@@ -653,18 +653,18 @@ REPLACE INTO `sys_dict_data` VALUES (2135, 2135, 'dictData.ne_version_status.1',
 REPLACE INTO `sys_dict_data` VALUES (2136, 2136, 'dictData.ne_version_status.2', '上一版本', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2137, 2137, 'dictData.ne_version_status.3', '有新版本', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2138, 2138, 'menu.fault.event', '事件通知', 'i18n_zh', '', '', '1', 'supervisor', 1717051745866, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (2139, 2139, 'menu.dashboard.smfCDR', 'SMF 话单', 'i18n_zh', '', '', '1', 'supervisor', 1717051745866, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (2140, 2140, 'log.operate.title.smfCDR', 'SMF-CDR会话', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2139, 2139, 'menu.dashboard.smfCDR', '数据话单', 'i18n_zh', '', '', '1', 'supervisor', 1717051745866, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2140, 2140, 'log.operate.title.smfCDR', '数据话单', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2141, 2141, 'config.sys.i18nDefaultRemark', '国际化默认语言可选择 en_US、zh_CN', 'i18n_zh', '', '', '1', 'supervisor', 1717051745866, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2142, 2142, 'config.sys.i18nOpenRemark', '是否显示切换的控件 true/false', 'i18n_zh', '', '', '1', 'supervisor', 1717051745866, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (2143, 2143, 'menu.dashboard.mmeUE', '4G UE事件', 'i18n_zh', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (2144, 2144, 'log.operate.title.mmeUE', '4G UE事件', 'i18n_zh', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2143, 2143, 'menu.dashboard.mmeUE', '4G 终端事件', 'i18n_zh', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2144, 2144, 'log.operate.title.mmeUE', '4G 终端事件', 'i18n_zh', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2145, 2145, 'menu.system.user.editPost', '修改用户岗位', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (2146, 2146, 'dictType.udm_sub_cn_type', 'UDM Sub CN Type', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (2147, 2147, 'dictData.udm_sub_cn_type.0', '没有5GC和EPC', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (2148, 2148, 'dictData.udm_sub_cn_type.1', '5GC', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (2149, 2149, 'dictData.udm_sub_cn_type.2', 'EPC', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (2150, 2150, 'dictData.udm_sub_cn_type.3', '5GC和EPC', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2147, 2147, 'dictData.udm_sub_cn_type.0', 'No 5G&4G', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2148, 2148, 'dictData.udm_sub_cn_type.1', '5G', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2149, 2149, 'dictData.udm_sub_cn_type.2', '4G', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (2150, 2150, 'dictData.udm_sub_cn_type.3', '5G&4G', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 
 -- multi-tenancy
 REPLACE INTO `sys_dict_data` VALUES (11000, 11000, 'menu.security.tenant', '租户管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
diff --git a/database/upgrade/upg_sys_dict_data2_i18n_en.sql b/database/upgrade/upg_sys_dict_data2_i18n_en.sql
index 29aaf40f..f0069f5f 100644
--- a/database/upgrade/upg_sys_dict_data2_i18n_en.sql
+++ b/database/upgrade/upg_sys_dict_data2_i18n_en.sql
@@ -344,13 +344,13 @@ REPLACE INTO `sys_dict_data` VALUES (3722, 3722, 'job.errTargetParams', 'Failed
 REPLACE INTO `sys_dict_data` VALUES (3723, 3723, 'job.errCronExpression', 'Scheduled task [{name}] failed with incorrect Cron expression!', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (3724, 3724, 'job.errJobExists', 'Failed to add a new task [{name}] to a scheduling task, same task name in the same task group', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (3725, 3725, 'job.statusEq', 'The change state is equal to the old value!', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (3750, 3750, 'role.admin', 'Super Administrator', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (3751, 3751, 'role.adminAssign', 'Managers', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (3750, 3750, 'role.system', 'System', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (3751, 3751, 'role.admin', 'Administrator', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (3752, 3752, 'role.operator', 'Operators', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (3753, 3753, 'role.monitor', 'Monitor', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (3754, 3754, 'role.vistor', 'General Users', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (3755, 3755, 'role.adminRemark', 'Super Administrator, cannot modify or delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (3756, 3756, 'role.adminAssignRemark', 'Administrators can perform any operation on the device', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (3755, 3755, 'role.systemRemark', 'System, cannot modify or delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (3756, 3756, 'role.adminRemark', 'Administrators can perform any operation on the device', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (3757, 3757, 'role.operatorRemark', 'Operation and maintenance personnel can read data from the device and configure the device, but cannot perform software upgrade operations on the device.', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (3758, 3758, 'role.monitorRemark', 'Monitoring personnel Can only read data from the device, but cannot make any settings on the device', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (3759, 3759, 'role.vistorRemark', 'Ordinary users can only see system-related information', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
@@ -544,7 +544,7 @@ REPLACE INTO `sys_dict_data` VALUES (4031, 4031, 'sys.account.captchaType', 'Acc
 REPLACE INTO `sys_dict_data` VALUES (4032, 4032, 'sys.account.captchaTypeRemark', 'Using CAPTCHA types (math numeric calculation, char character validation)', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (4033, 4033, 'menu.dashboard', 'Dashboard', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (4034, 4034, 'menu.dashboard.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (4035, 4035, 'menu.dashboard.imsCDR', 'IMS CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (4035, 4035, 'menu.dashboard.imsCDR', 'Voice CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (4036, 4036, 'dictType.cdr_sip_code', 'CDR SIP Response Code Category Type', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (4037, 4037, 'dictType.cdr_call_type', 'CDR Call Type', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (4038, 4038, 'dictType.ue_auth_code', 'UE Event Authentication Code Type', 'i18n_en', NULL, NULL, '1', 'supervisor', 1705550000000, NULL, 0, NULL);
@@ -617,7 +617,7 @@ REPLACE INTO `sys_dict_data` VALUES (4104, 4104, 'menu.config.neInfo', 'NE Info'
 REPLACE INTO `sys_dict_data` VALUES (4105, 4105, 'log.operate.title.neInfo', 'NE Info', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4106, 4106, 'neInfo.noData', 'There is no accessible network element information data!', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4107, 4107, 'neInfo.errKeyExists', 'NE info operation [{key}] failed, identifier already exists under the same type', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (4108, 4108, 'log.operate.title.imsCDR', 'IMS-CDR session', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (4108, 4108, 'log.operate.title.imsCDR', 'Voice CDR', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4109, 4109, 'menu.dashboard.amfUE', '5G UE Events', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4110, 4110, 'log.operate.title.amfUE', '5G UE Events', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4111, 4111, 'dictData.ne_info_status.0', 'Offline', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
@@ -648,18 +648,18 @@ REPLACE INTO `sys_dict_data` VALUES (4135, 4135, 'dictData.ne_version_status.1',
 REPLACE INTO `sys_dict_data` VALUES (4136, 4136, 'dictData.ne_version_status.2', 'Previous', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4137, 4137, 'dictData.ne_version_status.3', 'Has New', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4138, 4138, 'menu.fault.event', 'Event Notification', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (4139, 4139, 'menu.dashboard.smfCDR', 'SMF CDR', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (4140, 4140, 'log.operate.title.smfCDR', 'SMF-CDR session', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (4139, 4139, 'menu.dashboard.smfCDR', 'Data CDR', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (4140, 4140, 'log.operate.title.smfCDR', 'Data CDR', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4141, 4141, 'config.sys.i18nDefaultRemark', 'Internationalization default language selectable en_US、zh_CN', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4142, 4142, 'config.sys.i18nOpenRemark', 'Whether to display switched controls true/false', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4143, 4143, 'menu.dashboard.mmeUE', '4G UE Events', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4144, 4144, 'log.operate.title.mmeUE', '4G UE Events', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4145, 4145, 'menu.system.user.editPost', 'Modify User Post', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
 REPLACE INTO `sys_dict_data` VALUES (4146, 4146, 'dictType.udm_sub_cn_type', 'UDM Sub CN Type', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (4147, 4147, 'dictData.udm_sub_cn_type.0', 'No 5GC and EPC', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (4148, 4148, 'dictData.udm_sub_cn_type.1', '5GC', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (4149, 4149, 'dictData.udm_sub_cn_type.2', 'EPC', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
-REPLACE INTO `sys_dict_data` VALUES (4150, 4150, 'dictData.udm_sub_cn_type.3', '5GC and EPC', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (4147, 4147, 'dictData.udm_sub_cn_type.0', 'No 5G&4G', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (4148, 4148, 'dictData.udm_sub_cn_type.1', '5G', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (4149, 4149, 'dictData.udm_sub_cn_type.2', '4G', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
+REPLACE INTO `sys_dict_data` VALUES (4150, 4150, 'dictData.udm_sub_cn_type.3', '5G&4G', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, '');
 
 -- 多租户
 REPLACE INTO `sys_dict_data` VALUES (14000, 14000, 'menu.security.tenant', 'Tenant Management', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, '');
diff --git a/database/upgrade/upg_sys_role.sql b/database/upgrade/upg_sys_role.sql
index ec828112..bd38c726 100644
--- a/database/upgrade/upg_sys_role.sql
+++ b/database/upgrade/upg_sys_role.sql
@@ -1,7 +1,7 @@
 SET FOREIGN_KEY_CHECKS=0;
 
-INSERT IGNORE INTO `sys_role` VALUES (1, 'role.admin', 'supervisor', 1, '1', '1', '1', '1', '0', 'supervisor', 1697091437683, 'supervisor', 1697091437683, 'role.adminRemark');
-INSERT IGNORE INTO `sys_role` VALUES (2, 'role.adminAssign', 'administrator', 2, '1', '1', '1', '1', '0', 'supervisor', 1698486915894, 'supervisor', 1717143830709, 'role.adminAssignRemark');
+INSERT IGNORE INTO `sys_role` VALUES (1, 'role.system', 'system', 1, '1', '1', '1', '1', '0', 'supervisor', 1697091437683, 'supervisor', 1697091437683, 'role.systemRemark');
+INSERT IGNORE INTO `sys_role` VALUES (2, 'role.admin', 'admin', 2, '1', '1', '1', '1', '0', 'supervisor', 1698486915894, 'supervisor', 1717143830709, 'role.adminRemark');
 INSERT IGNORE INTO `sys_role` VALUES (3, 'role.operator', 'operator', 3, '1', '1', '1', '1', '0', 'supervisor', 1698486934900, 'supervisor', 1717143582784, 'role.operatorRemark');
 INSERT IGNORE INTO `sys_role` VALUES (4, 'role.monitor', 'monitor', 4, '1', '1', '1', '1', '0', 'supervisor', 1698486950714, 'supervisor', 1706774389300, 'role.monitorRemark');
 INSERT IGNORE INTO `sys_role` VALUES (5, 'role.vistor', 'vistor', 5, '1', '1', '1', '1', '0', 'supervisor', 1698486975779, 'supervisor', 1706774405096, 'role.vistorRemark');
diff --git a/src/framework/constants/admin/admin.go b/src/framework/constants/admin/admin.go
index 7ac32c50..1c158a8d 100644
--- a/src/framework/constants/admin/admin.go
+++ b/src/framework/constants/admin/admin.go
@@ -1,12 +1,12 @@
 package admin
 
-// 管理员常量信息
+// 系统管理员常量信息
 
-// 管理员-系统指定角色ID
+// 系统管理员-系统指定角色ID
 const ROLE_ID = "1"
 
-// 管理员-系统指定角色KEY
-const ROLE_KEY = "admin"
+// 系统管理员-系统指定角色KEY
+const ROLE_KEY = "system"
 
-// 管理员-系统指定权限
+// 系统管理员-系统指定权限
 const PERMISSION = "*:*:*"
diff --git a/src/framework/utils/ctx/ctx.go b/src/framework/utils/ctx/ctx.go
index 3174e5dc..cc17a092 100644
--- a/src/framework/utils/ctx/ctx.go
+++ b/src/framework/utils/ctx/ctx.go
@@ -84,8 +84,8 @@ func Authorization(c *gin.Context) string {
 		return ""
 	}
 	// 拆分 Authorization 请求头，提取 JWT 令牌部分
-	arr := strings.Split(authHeader, token.HEADER_PREFIX)
-	if len(arr) == 2 && arr[1] == "" {
+	arr := strings.SplitN(authHeader, token.HEADER_PREFIX, 2)
+	if len(arr) < 2 {
 		return ""
 	}
 	return arr[1]
diff --git a/src/framework/utils/parse/parse.go b/src/framework/utils/parse/parse.go
index 8eb27dcb..67fb8317 100644
--- a/src/framework/utils/parse/parse.go
+++ b/src/framework/utils/parse/parse.go
@@ -172,10 +172,10 @@ func Color(colorStr string) *color.RGBA {
 	}
 }
 
-// ConvertIPMask 转换IP网络地址掩码 24 -> 255.255.255.0
+// ConvertIPMask 转换IP网络地址掩码 24->"255.255.255.0" 20->"255.255.240.0"
 func ConvertIPMask(bits int64) string {
 	if bits < 0 || bits > 32 {
-		return "Invalid Mask Bits"
+		return "255.255.255.255"
 	}
 
 	// 构建一个32位的uint32类型掩码，指定前bits位为1，其余为0
diff --git a/src/modules/network_element/service/ne_info.impl.go b/src/modules/network_element/service/ne_info.impl.go
index 8909a85b..7b5041ca 100644
--- a/src/modules/network_element/service/ne_info.impl.go
+++ b/src/modules/network_element/service/ne_info.impl.go
@@ -705,20 +705,30 @@ func (r *NeInfoImpl) neConfPara5GDataConvert(content map[string]any) map[string]
 	}
 
 	n3IPAmdMask := external["upfn3_ip"].(string)
-	n3Arr := strings.Split(n3IPAmdMask, "/")
+	n3Arr := strings.SplitN(n3IPAmdMask, "/", 2)
 	n3IP := n3Arr[0]
-	n3Mask := parse.ConvertIPMask(parse.Number(n3Arr[1]))
+	n3Mask := "255.255.255.0"
+	if len(n3Arr) > 1 {
+		n3Mask = parse.ConvertIPMask(parse.Number(n3Arr[1]))
+	}
 
 	n6IPAmdMask := external["upfn6_ip"].(string)
-	n6Arr := strings.Split(n6IPAmdMask, "/")
+	n6Arr := strings.SplitN(n6IPAmdMask, "/", 2)
 	n6IP := n6Arr[0]
-	n6Mask := parse.ConvertIPMask(parse.Number(n6Arr[1]))
+	n6Mask := "255.255.255.0"
+	if len(n6Arr) > 1 {
+		n6Mask = parse.ConvertIPMask(parse.Number(n6Arr[1]))
+	}
 
 	ueIPAmdMask := external["ue_pool"].(string)
-	ueArr := strings.Split(ueIPAmdMask, "/")
+	ueArr := strings.SplitN(ueIPAmdMask, "/", 2)
 	ueIP := ueArr[0]
-	ueCicr := ueArr[1]
-	ueMask := parse.ConvertIPMask(parse.Number(ueArr[1]))
+	ueCicr := "24"
+	ueMask := "255.255.255.0"
+	if len(ueArr) > 1 {
+		ueCicr = ueArr[1]
+		ueMask = parse.ConvertIPMask(parse.Number(ueArr[1]))
+	}
 
 	return map[string]string{
 		// basic
diff --git a/src/modules/system/controller/sys_profile.go b/src/modules/system/controller/sys_profile.go
index 8b5669da..55095bcf 100644
--- a/src/modules/system/controller/sys_profile.go
+++ b/src/modules/system/controller/sys_profile.go
@@ -60,7 +60,7 @@ func (s *SysProfileController) Info(c *gin.Context) {
 	}
 	isAdmin := config.IsAdmin(loginUser.UserID)
 	if isAdmin {
-		roleGroup = append(roleGroup, i18n.TKey(language, "role.admin"))
+		roleGroup = append(roleGroup, i18n.TKey(language, "role.system"))
 	}
 
 	// 查询用户所属岗位组
diff --git a/src/modules/system/repository/sys_user.impl.go b/src/modules/system/repository/sys_user.impl.go
index 24b73405..dc9bd18a 100644
--- a/src/modules/system/repository/sys_user.impl.go
+++ b/src/modules/system/repository/sys_user.impl.go
@@ -282,7 +282,7 @@ func (r *SysUserImpl) SelectAllocatedPage(query map[string]any, dataScopeSQL str
 	}
 
 	// 构建查询条件语句
-	whereSql := " where u.del_flag = '0' "
+	whereSql := " where u.del_flag = '0' and u.user_id != '1' "
 	if len(conditions) > 0 {
 		whereSql += " and " + strings.Join(conditions, " and ")
 	}