diff --git a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java index 6810a625db..28b89b129d 100644 --- a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java +++ b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java @@ -104,6 +104,7 @@ public class MenuManage { || coreMenu.getId().equals(40L) || coreMenu.getId().equals(50L) || coreMenu.getId().equals(60L) - || coreMenu.getId().equals(61L); + || coreMenu.getId().equals(61L) + || coreMenu.getPid().equals(70L); } } diff --git a/core/core-backend/src/main/resources/db/migration/V2.10.3__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10.3__ddl.sql index 71f6a6168a..60b271c0d5 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.10.3__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.10.3__ddl.sql @@ -2,6 +2,5 @@ INSERT INTO `core_sys_setting`(`id`, `pkey`, `pval`, `type`, `sort`) VALUES (1048232869488627719, 'basic.defaultSort', '1', 'text', 13); INSERT INTO `core_menu` VALUES (70, 0, 1, 'msg', NULL, 200, NULL, '/msg', 1, 1, 0); -INSERT INTO `core_menu` VALUES (71, 70, 2, 'msg-fill', 'msg/fill', 1, 'icon_msg_fill', '/msg-fill', 0, 1, 0); UPDATE `xpack_setting_authentication` set `synced` = 0 where `name` = 'oidc' or name = 'cas'; \ No newline at end of file diff --git a/core/core-frontend/src/views/msg/fill/index.vue b/core/core-frontend/src/views/msg/fill/index.vue deleted file mode 100644 index e5ca8d8d1f..0000000000 --- a/core/core-frontend/src/views/msg/fill/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/de-xpack b/de-xpack index cd39f4ce5c..d02a09a678 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit cd39f4ce5c213ccfc1f3847c8bdcfce7d78e673f +Subproject commit d02a09a6780123598f4e1068cb6762ff9150b07d