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/dto/AccountDesignWorksRegisterDTO.java

@@ -0,0 +1,8 @@
+package com.ai.da.model.dto;
+
+import com.ai.da.mapper.primary.entity.Account;
+import lombok.Data;
+
+@Data
+public class AccountDesignWorksRegisterDTO extends Account {
+}

src/main/java/com/ai/da/model/dto/DesignWorksRegisterDTO.java

@@ -0,0 +1,10 @@
+package com.ai.da.model.dto;
+
+import lombok.Data;
+
+@Data
+public class DesignWorksRegisterDTO {
+    private String userName;
+    private String email;
+    private String password;
+}

src/main/java/com/ai/da/model/dto/ExportSaveDTO.java

@@ -0,0 +1,8 @@
+package com.ai.da.model.dto;
+
+import lombok.Data;
+
+@Data
+public class ExportSaveDTO {
+    private String data;
+}

src/main/java/com/ai/da/model/dto/ExportSearchDTO.java

@@ -0,0 +1,8 @@
+package com.ai.da.model.dto;
+
+import lombok.Data;
+
+@Data
+public class ExportSearchDTO {
+    private Long userLikeGroupId;
+}

src/main/java/com/ai/da/model/dto/PortfolioDTO.java

@@ -2,9 +2,11 @@ package com.ai.da.model.dto;
 
 import com.ai.da.mapper.primary.entity.Portfolio;
 import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
 
 @Data
 public class PortfolioDTO extends Portfolio {
     private Long userLikeGroupId;
-
 }

src/main/java/com/ai/da/model/dto/ProductImageLikeDTO.java

@@ -0,0 +1,10 @@
+package com.ai.da.model.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ProductImageLikeDTO {
+    private List<Long> toProductImageResultId;
+}

src/main/java/com/ai/da/model/dto/ToProductImageDTO.java

@@ -0,0 +1,13 @@
+package com.ai.da.model.dto;
+
+import com.ai.da.model.vo.ToProductImageVO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ToProductImageDTO {
+    private Long userLikeGroupId;
+    private List<ToProductImageVO> toProductImageVOList;
+    private String prompt;
+}

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;

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

@@ -9,7 +9,7 @@ import java.util.List;
 
 @Data
 public class PortfolioVO extends Portfolio {
-    private String designPythonOutfitUrl;
+    private String canvasUrl;
 
     private List<CollectionElement> collectionElementList;
     private List<TDesignPythonOutfit> designPythonOutfitList;

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

@@ -0,0 +1,8 @@
+package com.ai.da.model.vo;
+
+import com.ai.da.mapper.primary.entity.ToProductElement;
+import lombok.Data;
+
+@Data
+public class ToProductElementVO extends ToProductElement {
+}

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

@@ -0,0 +1,9 @@
+package com.ai.da.model.vo;
+
+import com.ai.da.mapper.primary.entity.ToProductImageResult;
+import lombok.Data;
+
+@Data
+public class ToProductImageVO extends ToProductImageResult {
+
+}

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

@@ -0,0 +1,8 @@
+package com.ai.da.model.vo;
+
+import com.ai.da.mapper.primary.entity.UserLike;
+import lombok.Data;
+
+@Data
+public class ToProductVO extends UserLike {
+}