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/mapper/primary/BrandDNAMapper.java

@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.BrandDNA;
+
+public interface BrandDNAMapper extends CommonMapper<BrandDNA> {
+}

src/main/java/com/ai/da/mapper/primary/BrandRelLibraryMapper.java

@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.BrandRelLibrary;
+
+public interface BrandRelLibraryMapper extends CommonMapper<BrandRelLibrary> {
+}

src/main/java/com/ai/da/mapper/primary/entity/BrandDNA.java

@@ -0,0 +1,37 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("brand")
+public class BrandDNA implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Long accountId;
+
+    private String brandName;
+
+    private String brandSlogan;
+
+    private String brandLogo;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+}

src/main/java/com/ai/da/mapper/primary/entity/BrandRelLibrary.java

@@ -0,0 +1,29 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("brand_rel_library")
+public class BrandRelLibrary implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Long brandId;
+    private Long libraryId;
+
+}

src/main/java/com/ai/da/mapper/primary/entity/ToProductElement.java

@@ -19,6 +19,8 @@ public class ToProductElement implements Serializable {
     @ApiModelProperty(value = "userLikeGroupId")
     private Long userLikeGroupId;
 
+    private Long projectId;
+
     @ApiModelProperty(value = "url")
     private String url;
 

src/main/java/com/ai/da/mapper/primary/entity/ToProductImageRecord.java

@@ -19,6 +19,8 @@ public class ToProductImageRecord implements Serializable {
     @ApiModelProperty(value = "userLikeGroupId")
     private Long userLikeGroupId;
 
+    private Long projectId;
+
     @ApiModelProperty(value = "prompt")
     private String prompt;
 

src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java

@@ -49,4 +49,6 @@ public class ToProductImageResult implements Serializable {
     private BigDecimal imageStrength;
 
     private String direction;
+
+    private Long projectId;
 }