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

Merge branch 'dev/dev' into dev/dev_xp

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
This commit is contained in:
xupei
2024-06-25 15:42:22 +08:00
parent 8ea06c05e9 3e150b2067
commit be001477ce
15 changed files with 73 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/ai/da/controller/PortfolioController.java
View File

@@ -105,4 +105,10 @@ public class PortfolioController {
public Response<Long> viewsGet(@RequestParam("id") Long id) {
return Response.success(portfolioService.viewsGet(id));
}
@ApiOperation(value = "删除评论")
@PostMapping("/commentDelete")
public Response<Boolean> commentDelete(@Valid @RequestBody CommentDTO commentDTO) {
return Response.success(portfolioService.commentDelete(commentDTO));
}
}

4
src/main/java/com/ai/da/controller/WorkspaceController.java
View File

@@ -95,8 +95,8 @@ public class WorkspaceController {
@GetMapping("/getMannequins")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "获取模特")
public Response<List<ModelsVO>> getMannequins(@RequestParam("sex") String sex) {
List<ModelsVO> modelsVO = workspaceService.getMannequins(sex);
public Response<List<ModelsVO>> getMannequins(@RequestParam("sex") String sex, @RequestParam("style") String style) {
List<ModelsVO> modelsVO = workspaceService.getMannequins(sex, style);
return Response.success(modelsVO);
}