aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/3.0' into dev/dev

Browse Source 
# 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
This commit is contained in:
xupei
2024-10-10 23:26:20 +08:00
parent 5098f6f4a1 c439f41d69
commit e684c4e547
272 changed files with 362 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java
View File

@@ -1,12 +1,11 @@
package com.ai.da.model.vo;
import com.ai.da.model.dto.PortfolioDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.util.List;
@AllArgsConstructor
@Data
@ApiModel("用户choose详细-响应")
@@ -24,4 +23,7 @@ public class UserLikeChooseVO {
private String sex;
private Integer beenPublished;
// private Portfolio portfolio;
private PortfolioDTO portfolioDTO;
}