Merge branch 'dev/dev' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
#	src/main/resources/application-dev.properties

src/main/java/com/ai/da/mapper/primary/PortfolioMapper.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.Portfolio;
+
+public interface PortfolioMapper extends CommonMapper<Portfolio> {
+}

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

@@ -0,0 +1,17 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.Style;
+
+import java.util.List;
+
+/**
+ * Mapper 接口
+ *
+ * @author easy-generator
+ * @since 2022-06-13
+ */
+public interface StyleMapper extends CommonMapper<Style> {
+
+
+}

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

@@ -0,0 +1,15 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.WorkspaceRelStyle;
+
+/**
+ * Mapper 接口
+ *
+ * @author easy-generator
+ * @since 2022-06-13
+ */
+public interface WorkspaceRelStyleMapper extends CommonMapper<WorkspaceRelStyle> {
+
+
+}

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

@@ -0,0 +1,55 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+@Data
+@ApiModel(value = "Portfolio对象", description = "作品集")
+@TableName("portfolio")
+public class Portfolio implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "collection ID")
+    private Long collectionId;
+
+    @ApiModelProperty(value = "userLikeGroup源")
+    private Long userLikeGroupSourceId;
+
+    @ApiModelProperty(value = "作品名称")
+    private String portfolioName;
+
+    @ApiModelProperty(value = "作品描述")
+    private String portfolioDes;
+
+    @ApiModelProperty(value = "作品类型")
+    private String portfolioType;
+
+    @ApiModelProperty(value = "封面ID")
+    private Long coverId;
+
+    @ApiModelProperty(value = "作品状态1公开0隐藏")
+    private Integer status;
+
+    @ApiModelProperty(value = "作品集作者ID")
+    private Long accountId;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "更新时间")
+    private LocalDateTime updateDate;
+
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDeleted;
+}

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

@@ -0,0 +1,17 @@
+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 java.io.Serializable;
+
+@Data
+@TableName("style")
+public class Style implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    private String name;
+}

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

@@ -0,0 +1,18 @@
+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 java.io.Serializable;
+
+@Data
+@TableName("workspace_rel_style")
+public class WorkspaceRelStyle implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    private Long workspaceId;
+    private Long styleId;
+}