diff --git a/.gitignore b/.gitignore
index 0c403a5842..4cf03103c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@ core/core-frontend/src/assets/fsSvg.html
 /sdk/dataease-plugin-view/
 /extensions/
 .vite/
+/core/backend/
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 3f1b7e1df1..a28896d782 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
@@ -42,6 +42,7 @@ public class MenuManage {
     @Cacheable(cacheNames = CORE_MENU_CACHE, key = "'-dataease-'")
     public List<CoreMenu> coreMenus() {
         QueryWrapper<CoreMenu> wrapper = new QueryWrapper<>();
+        wrapper.orderByAsc("menu_sort");
         return coreMenuMapper.selectList(wrapper);
     }
 
diff --git a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties
index 36a4670dde..0aa7d104fe 100644
--- a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties
+++ b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties
@@ -7,7 +7,8 @@ i18n_menu.visualized=\u53EF\u89C6\u5316
 i18n_menu.template=\u6A21\u7248
 i18n_menu.application=\u5E94\u7528
 i18n_menu.system=\u7CFB\u7EDF\u7BA1\u7406
-
+i18n_menu.template-market=\u6A21\u7248\u5E02\u573A
+i18n_menu.template-setting=\u6A21\u7248\u7BA1\u7406
 i18n_menu.view=\u6570\u636E\u5C55\u793A
 i18n_menu.data=\u6570\u636E\u51C6\u5907
 i18n_menu.panel=\u4EEA\u8868\u677F
diff --git a/core/core-frontend/src/assets/svg/icon_template.svg b/core/core-frontend/src/assets/svg/icon_template.svg
new file mode 100644
index 0000000000..639de0ac3b
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/icon_template.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="" clip-rule="evenodd" d="M5 3H16V5.5195C16 5.65211 16.0527 5.77928 16.1464 5.87305C16.2402 5.96682 16.3674 6.0195 16.5 6.0195H19V21H5V3ZM17.0855 1H4C3.73478 1 3.48043 1.10536 3.29289 1.29289C3.10536 1.48043 3 1.73478 3 2V22C3 22.2652 3.10536 22.5196 3.29289 22.7071C3.48043 22.8946 3.73478 23 4 23H20C20.2652 23 20.5196 22.8946 20.7071 22.7071C20.8946 22.5196 21 22.2652 21 22V4.9155C21.0001 4.65038 20.8949 4.39607 20.7075 4.2085L17.793 1.293C17.7001 1.20008 17.5898 1.12637 17.4684 1.07609C17.347 1.02582 17.2169 0.999962 17.0855 1ZM7.5 8C7.22386 8 7 8.22386 7 8.5V9.5C7 9.77614 7.22386 10 7.5 10H16.5C16.7761 10 17 9.77614 17 9.5V8.5C17 8.22386 16.7761 8 16.5 8H7.5ZM11 12.5C11 12.2239 11.2239 12 11.5 12H16.5C16.7761 12 17 12.2239 17 12.5V17.5C17 17.7761 16.7761 18 16.5 18H11.5C11.2239 18 11 17.7761 11 17.5V12.5ZM7.5 12C7.22386 12 7 12.2239 7 12.5V17.5C7 17.7761 7.22386 18 7.5 18H8.5C8.77614 18 9 17.7761 9 17.5V12.5C9 12.2239 8.77614 12 8.5 12H7.5Z" fill=""/>
+</svg>
diff --git a/core/core-frontend/src/views/system/template-setting/index.vue b/core/core-frontend/src/views/system/template-setting/index.vue
new file mode 100644
index 0000000000..6258e890f8
--- /dev/null
+++ b/core/core-frontend/src/views/system/template-setting/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <h2>template setting page for jiahao.wang</h2>
+</template>
diff --git a/core/core-frontend/src/views/template-market/index.vue b/core/core-frontend/src/views/template-market/index.vue
new file mode 100644
index 0000000000..4ec75a4e20
--- /dev/null
+++ b/core/core-frontend/src/views/template-market/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <h2>template marget page for jiahao.wang</h2>
+</template>
diff --git a/de-xpack b/de-xpack
index e3143e3176..1023f4cab4 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit e3143e3176ca189c35729fa7bb195264c061a824
+Subproject commit 1023f4cab4d7960b2a4793161773c8803bb507f3