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;
+}