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/model/dto/AccountTrialDTO.java

@@ -9,5 +9,5 @@ import lombok.EqualsAndHashCode;
 @Data
 @ApiModel("AccountTrial")
 public class AccountTrialDTO extends TrialOrder {
-
+    private String ref;
 }

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

@@ -0,0 +1,10 @@
+package com.ai.da.model.dto;
+
+import com.ai.da.mapper.primary.entity.Portfolio;
+import lombok.Data;
+
+@Data
+public class PortfolioDTO extends Portfolio {
+    private Long userLikeGroupId;
+
+}

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

@@ -0,0 +1,14 @@
+package com.ai.da.model.dto;
+
+import com.ai.da.model.vo.PageQueryBaseVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("作品集分页查询")
+public class QueryPortfolioPageDTO extends PageQueryBaseVo {
+
+}

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

@@ -0,0 +1,22 @@
+
+package com.ai.da.model.dto;
+
+import com.ai.da.mapper.primary.entity.Workspace;
+import com.ai.da.model.vo.PageQueryBaseVo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author SHAHAIBO
+ * @since 2023-08-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WorkspaceSaveDTO extends Workspace {
+    private static final long serialVersionUID = 1L;
+
+    private Long styleId;
+
+}