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/vo/PortfolioVO.java

@@ -0,0 +1,16 @@
+package com.ai.da.model.vo;
+
+import com.ai.da.mapper.primary.entity.CollectionElement;
+import com.ai.da.mapper.primary.entity.Portfolio;
+import com.ai.da.mapper.primary.entity.TDesignPythonOutfit;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PortfolioVO extends Portfolio {
+    private String designPythonOutfitUrl;
+
+    private List<CollectionElement> collectionElementList;
+    private List<TDesignPythonOutfit> designPythonOutfitList;
+}

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

@@ -0,0 +1,16 @@
+package com.ai.da.model.vo;
+
+import com.ai.da.mapper.primary.entity.Style;
+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
+public class StyleVO extends Style {
+    private static final long serialVersionUID = 1L;
+
+    private String value;
+}

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

@@ -33,4 +33,6 @@ public class WorkspaceVO extends Workspace {
 
     private BizJson positionEnum;
 
+    private String styleName;
+
 }