Merge branch 'dev/dev' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java

src/main/java/com/ai/da/model/enums/StyleEnum.java

@@ -6,7 +6,7 @@ import lombok.Getter;
 @Getter
 public enum StyleEnum {
     // 定义风格及其对应的中英文描述
-    NEO_CHINESE("新中式", "Neo Chinese"),
+    NEW_CHINESE("新中式", "New Chinese"),
     COUNTRY_STYLE("田园风", "Country Style"),
     FUTURISM("未来主义", "Futurism"),
     MINIMALISM("极简风", "Minimalism"),

src/main/java/com/ai/da/model/enums/StyleKeywordMapper.java

@@ -82,7 +82,7 @@ public class StyleKeywordMapper {
         wabiSabiKeywords.put("Printboard", Arrays.asList("natural materials such as wood", "stone", "hemp rope", "neutral tones and light colors"));
         wabiSabiKeywords.put("Sketchboard", Arrays.asList("a quiet and peaceful atmosphere"));
 
-        styleCategoryKeywords.put(StyleEnum.NEO_CHINESE, neoChineseKeywords);
+        styleCategoryKeywords.put(StyleEnum.NEW_CHINESE, neoChineseKeywords);
         styleCategoryKeywords.put(StyleEnum.COUNTRY_STYLE, countryStyleKeywords);
         styleCategoryKeywords.put(StyleEnum.FUTURISM, futurismKeywords);
         styleCategoryKeywords.put(StyleEnum.MINIMALISM, minimalistKeywords);

src/main/java/com/ai/da/model/vo/WorkspaceVO.java

@@ -38,6 +38,8 @@ public class WorkspaceVO extends Workspace {
 
     private String styleName;
 
+    private String style;
+
     private Map<String, List<String>> allKeywordsByStyle;
 
 }