Merge remote-tracking branch 'origin/dev/dev' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/mapper/primary/entity/DesignItem.java

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

@@ -29,6 +29,8 @@ public class DesignCollectionDTO {
     @ApiModelProperty("手稿板图片id  数组")
     private List<CollectionSketchDTO> sketchBoards;
 
+    private List<MannequinDTO> mannequins;
+
     @NotNull(message = "systemScale.cannot.be.empty")
     @ApiModelProperty("系统取图比列")
     private BigDecimal systemScale;

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

@@ -9,6 +9,9 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class MannequinDTO {
     private Long id;
+
+    private Long collectionElementId;
+
     private String type;
 //    private String modelType;
 }

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

@@ -1,5 +1,6 @@
 package com.ai.da.model.dto;
 
+import com.ai.da.mapper.primary.entity.Library;
 import com.ai.da.model.vo.CollectionColorVO;
 import com.ai.da.model.vo.CollectionElementVO;
 import com.ai.da.model.vo.MoodBoardModuleChooseVO;
@@ -29,6 +30,8 @@ public class ModuleSaveDTO {
 
     private PatternMaking3DDTO patternMaking3D;
 
+    private List<MannequinDTO> mannequin;
+
 //    private MoodBoardModuleChooseVO moodBoard;
 //    private List<CollectionElementVO> printBoard;
 //    private List<CollectionColorVO> colorBoard;

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

@@ -31,6 +31,8 @@ public class QueryLibraryPageServiceDTO extends PageQueryBaseVo {
     @ApiModelProperty("1交集2并集")
     private Integer intersection;
 
+    private String ageGroup;
+
     private Long brandId;
 
 }

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

@@ -9,4 +9,5 @@ public class ReceiveCollectionElement {
     private String level2Type;
     private String rgb;
     private String hsv;
+    private String minioUrl;
 }

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

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

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

@@ -46,4 +46,7 @@ public class CollectionElementVO {
 
     private List<String> segmentedImages;
 
+    private Long mannequinRelationId;
+    private String mannequinRelationType;
+
 }

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

@@ -40,5 +40,9 @@ public class DesignLibraryModelPointVO implements Serializable {
 
     private String templateUrl;
 
+    private Long relationId;
+
+    private String relationType;
+
 
 }

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

@@ -35,4 +35,6 @@ public class ModuleChooseVO {
     private SketchReconstructionVO deReconstruction;
 
     private ThreeDModuleVO patternMaking3D;
+
+    private List<CollectionElementVO> mannequin;
 }

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

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.util.List;
+
 @AllArgsConstructor
 @Data
 @ApiModel("用户choose详细-响应")
@@ -15,7 +17,7 @@ public class UserLikeChooseVO {
     private Long userGroupId;
 
     @ApiModelProperty("分组详细数组")
-    private java.util.List<UserLikeVO> userLikeDetails;
+    private List<UserLikeVO> userLikeDetails;
 
     @ApiModelProperty("关联的collection")
     private UserLikeCollectionVO collection;

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

@@ -2,6 +2,7 @@ package com.ai.da.model.vo;
 
 import com.ai.da.mapper.primary.entity.CollectionElement;
 import com.ai.da.model.dto.CollectionColorDTO;
+import com.ai.da.model.dto.MannequinDTO;
 import com.ai.da.python.vo.DesignPythonItemPrint;
 import com.google.common.collect.Lists;
 import io.swagger.annotations.ApiModel;
@@ -59,4 +60,6 @@ public class ValidateElementVO {
     private Long brandId;
 
     private Double brandScale;
+    private List<DesignLibraryModelPointVO> mannequins;
+    private DesignLibraryModelPointVO designLibraryModelPointVO;
 }

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

@@ -40,6 +40,9 @@ public class WorkspaceVO extends Workspace {
 
     private String style;
 
+    private String userBrandDnaImg;
+    private String userBrandDnaName;
+
     private Map<String, List<String>> allKeywordsByStyle;
 
 }