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

# Conflicts:
#	src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java
#	src/main/java/com/ai/da/python/PythonService.java
#	src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java

src/main/java/com/ai/da/model/vo/DesignCollectionItemVO.java

@@ -16,6 +16,13 @@ public class DesignCollectionItemVO {
     @ApiModelProperty("design生成的图片地址 绝对路径")
     private String designItemUrl;
 
+    @ApiModelProperty("t_design_python_outfit id")
+    private Long designOutfitId;
+
+    @ApiModelProperty("t_design_python_outfit id")
+    private String designOutfitUrl;
+
     public DesignCollectionItemVO() {
+
     }
 }

src/main/java/com/ai/da/model/vo/TDesignPythonOutfitDetailVO.java

@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModel;
 /**
  * design item详情表视图实体类
  *
- * @author Arcana
+ * @author SHAHAIBO
  * @since 2023-09-04
  */
 @Data

src/main/java/com/ai/da/model/vo/TDesignPythonOutfitVO.java

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModel;
 /**
  * design item表 存对应design的8张图片视图实体类
  *
- * @author Arcana
+ * @author SHAHAIBO
  * @since 2023-09-04
  */
 @Data

src/main/java/com/ai/da/model/vo/WorkspaceVO.java

@@ -1,6 +1,7 @@
 
 package com.ai.da.model.vo;
 
+import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.mapper.entity.Workspace;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -9,13 +10,18 @@ import io.swagger.annotations.ApiModel;
 /**
  * 视图实体类
  *
- * @author Arcana
+ * @author SHAHAIBO
  * @since 2023-08-01
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "WorkspaceVO对象", description = "WorkspaceVO对象")
 public class WorkspaceVO extends Workspace {
+
     private static final long serialVersionUID = 1L;
 
+    private Long currentId;
+
+    private PageBaseResponse<Workspace> page;
+
 }