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

@@ -0,0 +1,10 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.CollectionElementRelModel;
+
+import java.util.Set;
+
+public interface CollectionElementRelModelMapper extends CommonMapper<CollectionElementRelModel> {
+
+}

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

@@ -31,5 +31,7 @@ public class ChatMessage implements Serializable {
 
     private Long accountId;
 
+    private Integer isImage;
+
     private LocalDateTime createTime;
 }

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

@@ -0,0 +1,34 @@
+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.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("collection_element_rel_model")
+public class CollectionElementRelModel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Long relationId;
+
+    private String relationType;
+
+    private Long collectionElementId;
+
+    private String ageGroup;
+
+}

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

@@ -101,7 +101,7 @@ public class Workspace implements Serializable {
 
     private Long projectId;
 
-    private Integer userBrandDna;
+    private Long userBrandDna;
 
     private Integer brandPercentage;