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/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 {
+}