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