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

# Conflicts:
#	src/main/java/com/ai/da/python/PythonService.java

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

@@ -0,0 +1,13 @@
+package com.ai.da.model.dto;
+
+import com.ai.da.mapper.primary.entity.BrandDNA;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+//@AllArgsConstructor
+//@NoArgsConstructor
+public class BrandDNADTO extends BrandDNA {
+
+}

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

@@ -26,4 +26,6 @@ public class DesignLikeDTO {
     @NotBlank(message = "timeZone.cannot.be.empty")
     @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取")
     private String timeZone;
+
+    private Long projectId;
 }

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

@@ -10,4 +10,5 @@ import lombok.NoArgsConstructor;
 public class MannequinDTO {
     private Long id;
     private String type;
+//    private String modelType;
 }

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

@@ -7,4 +7,6 @@ import java.util.List;
 @Data
 public class ProductImageInitializeDTO {
     private List<Long> libraryIds;
+
+    private Long brandId;
 }

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

@@ -8,7 +8,7 @@ import java.util.List;
 
 @Data
 public class ToProductImageDTO {
-    private Long userLikeGroupId;
+    private Long projectId;
     private List<ToProductImageVO> toProductImageVOList;
     private String prompt;
     private BigDecimal imageStrength;