Merge branch 'dev/dev' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java

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

@@ -14,4 +14,8 @@ public class PortfolioVO extends Portfolio {
     private List<CollectionElement> collectionElementList;
     private List<TDesignPythonOutfit> designPythonOutfitList;
     private Integer isLike;
+
+    private Long viewNums;
+
+    private String userName;
 }

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

@@ -8,6 +8,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 视图实体类
  *
@@ -35,4 +38,6 @@ public class WorkspaceVO extends Workspace {
 
     private String styleName;
 
+    private Map<String, List<String>> allKeywordsByStyle;
+
 }