Merge branch 'dev/dev' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
#	src/main/resources/application-dev.properties
#	src/main/resources/messages_en.properties
#	src/main/resources/messages_zh.properties

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

@@ -2,7 +2,7 @@ package com.ai.da.model.enums;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
-public enum DesignElementsEnum {
+public enum DesignElementsEnum implements IEnumDisplay {
     EMBROIDERY("刺绣", "Embroidery"),
     BEADING("钉珠", "Beading"),
     PEARL("珍珠", "Pearl"),
@@ -16,6 +16,12 @@ public enum DesignElementsEnum {
     private final String chinese;
     private final String english;
 
+    @Override
+    @JsonValue
+    public String getValue() {
+        return this.english;
+    }
+
     // 构造函数
     DesignElementsEnum(String chinese, String english) {
         this.chinese = chinese;

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

@@ -1,6 +1,8 @@
 package com.ai.da.model.enums;
 
-public enum PrintboardLevel2TypeEnum {
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum PrintboardLevel2TypeEnum implements IEnumDisplay {
     SLOGAN("标语", "Slogan"),
     LOGO("标志", "Logo"),
     PATTERN("图案", "Pattern");
@@ -14,6 +16,12 @@ public enum PrintboardLevel2TypeEnum {
         this.english = english;
     }
 
+    @Override
+    @JsonValue
+    public String getValue() {
+        return this.english;
+    }
+
     // 获取中文描述
     public String getChinese() {
         return chinese;