Merge branch 'dev/dev' into dev/dev_xp

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

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

@@ -0,0 +1,48 @@
+package com.ai.da.model.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum DesignElementsEnum {
+    EMBROIDERY("刺绣", "Embroidery"),
+    BEADING("钉珠", "Beading"),
+    PEARL("珍珠", "Pearl"),
+    RIVET("铆钉", "Rivet"),
+    BUTTON("纽扣", "Button"),
+    BELT("腰带", "Belt"),
+    CORSAGE("胸花", "Corsage"),
+    ZIPPER("拉链", "Zipper"),
+    POCKET("口袋", "Pocket");
+
+    private final String chinese;
+    private final String english;
+
+    // 构造函数
+    DesignElementsEnum(String chinese, String english) {
+        this.chinese = chinese;
+        this.english = english;
+    }
+
+    // 获取中文描述
+    public String getChinese() {
+        return chinese;
+    }
+
+    // 获取英文描述
+    public String getEnglish() {
+        return english;
+    }
+
+    // 重写toString方法，返回格式化的描述
+    @Override
+    public String toString() {
+        return chinese + " (" + english + ")";
+    }
+    public static DesignElementsEnum fromName(String name) {
+        for (DesignElementsEnum designElement : DesignElementsEnum.values()) {
+            if (designElement.name().equals(name)) {
+                return designElement;
+            }
+        }
+        throw new IllegalArgumentException("No enum constant for name: " + name);
+    }
+}

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

@@ -8,6 +8,7 @@ import lombok.Getter;
  * @Date: 2023/10/31 14:16
  * @Description: 语言
  */
+@Getter
 public enum Language implements IEnumDisplay {
 
     ENGLISH("en", "US"), // 英文
@@ -29,7 +30,7 @@ public enum Language implements IEnumDisplay {
     ITALIAN("it", "IT"); // 意大利语
 
     private String languageCode;
-    @Getter
+
     private String countryCode;
 
     Language(String languageCode, String countryCode) {

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

@@ -0,0 +1,42 @@
+package com.ai.da.model.enums;
+
+public enum PrintboardLevel2TypeEnum {
+    SLOGAN("标语", "Slogan"),
+    LOGO("标志", "Logo"),
+    PATTERN("图案", "Pattern");
+
+    private final String chinese;
+    private final String english;
+
+    // 构造函数
+    PrintboardLevel2TypeEnum(String chinese, String english) {
+        this.chinese = chinese;
+        this.english = english;
+    }
+
+    // 获取中文描述
+    public String getChinese() {
+        return chinese;
+    }
+
+    // 获取英文描述
+    public String getEnglish() {
+        return english;
+    }
+
+    // 重写toString方法，返回格式化的描述
+    @Override
+    public String toString() {
+        return chinese + " (" + english + ")";
+    }
+
+    // 根据名称获取枚举值
+    public static PrintboardLevel2TypeEnum fromName(String name) {
+        for (PrintboardLevel2TypeEnum designElement : PrintboardLevel2TypeEnum.values()) {
+            if (designElement.name().equals(name)) {
+                return designElement;
+            }
+        }
+        throw new IllegalArgumentException("No enum constant for name: " + name);
+    }
+}