diff --git a/backend/src/main/java/io/dataease/plugins/server/ThemeServer.java b/backend/src/main/java/io/dataease/plugins/server/ThemeServer.java
index d272501124..e1802e3190 100644
--- a/backend/src/main/java/io/dataease/plugins/server/ThemeServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/ThemeServer.java
@@ -2,6 +2,7 @@ package io.dataease.plugins.server;
 
 import java.util.List;
 
+import io.dataease.plugins.xpack.theme.dto.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ObjectUtils;
@@ -15,13 +16,7 @@ import io.dataease.commons.exception.DEException;
 import io.dataease.commons.utils.LogUtil;
 import io.dataease.i18n.Translator;
 import io.dataease.plugins.config.SpringContextUtil;
-import io.dataease.plugins.xpack.theme.dto.ThemeCreateRequest;
-import io.dataease.plugins.xpack.theme.dto.ThemeDto;
-import io.dataease.plugins.xpack.theme.dto.ThemeItem;
-import io.dataease.plugins.xpack.theme.dto.ThemeRenameRequest;
-import io.dataease.plugins.xpack.theme.dto.ThemeRequest;
 import io.dataease.plugins.xpack.theme.service.ThemeXpackService;
-import springfox.documentation.annotations.ApiIgnore;
 
 @Api(tags = "xpack：系统主题")
 @RequestMapping("/plugin/theme")
@@ -30,10 +25,11 @@ public class ThemeServer {
 
     @ApiOperation("查询所有")
     @PostMapping("/themes")
-    public List<ThemeDto> themes() {
+    public List<ThemeBaseDTO> themes(@RequestBody List<String> keys) {
 
         ThemeXpackService themeXpackService = SpringContextUtil.getBean(ThemeXpackService.class);
-        return themeXpackService.themes();
+
+        return themeXpackService.themes(keys);
     }
 
     @ApiOperation("查询配置项")
diff --git a/backend/src/main/resources/db/migration/V39__1.14.sql b/backend/src/main/resources/db/migration/V39__1.14.sql
index c22aa265b9..c56403fb58 100644
--- a/backend/src/main/resources/db/migration/V39__1.14.sql
+++ b/backend/src/main/resources/db/migration/V39__1.14.sql
@@ -17,3 +17,8 @@ update sys_background_image set name ='边框10' where id ='dark_1';
 
 
 INSERT INTO `sys_menu` VALUES (750, 2, 0, 2, '导入用户', NULL, NULL, 999, NULL, NULL, b'0', b'0', b'0', 'user:import', NULL, NULL, 1614930935529, 1614930935529);
+
+
+update system_parameter set sort  = (sort + 1) where sort > 3;
+
+update system_parameter set sort = 4 where param_key = 'ui.favicon'