Merge branch 'release/3.0' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/common/constant/CommonConstant.java
#	src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
#	src/main/java/com/ai/da/controller/PortfolioController.java
#	src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java
#	src/main/java/com/ai/da/service/PortfolioService.java
#	src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
#	src/main/resources/messages_en.properties
#	src/main/resources/messages_zh.properties

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

@@ -2,11 +2,11 @@ package com.ai.da.model.dto;
 
 import com.ai.da.mapper.primary.entity.Portfolio;
 import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
+import java.util.List;
 
 @Data
 public class PortfolioDTO extends Portfolio {
     private Long userLikeGroupId;
+
+    private List<TagsDTO> tagsDTO;
 }

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

@@ -2,11 +2,8 @@ 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 {
@@ -16,4 +13,6 @@ public class QueryPortfolioPageDTO extends PageQueryBaseVo {
     private Integer getLikePortfolio;
 
     private Long accountId;
+
+    private Long tagId;
 }

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

@@ -0,0 +1,6 @@
+package com.ai.da.model.dto;
+
+import com.ai.da.mapper.primary.entity.Tags;
+
+public class TagsDTO extends Tags {
+}