Merge branch 'dev/dev' into dev/dev_shb
# Conflicts: # src/main/java/com/ai/da/controller/AccountController.java # src/main/java/com/ai/da/controller/SavedCollectionController.java # src/main/java/com/ai/da/service/AccountService.java # src/main/java/com/ai/da/service/UserLikeGroupService.java # src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
This commit is contained in:
@@ -246,6 +246,12 @@ public class SavedCollectionController {
|
||||
return Response.success(userLikeGroupService.likeHistoryRelSketch());
|
||||
}
|
||||
|
||||
@ApiOperation(value = "download")
|
||||
@PostMapping("/download")
|
||||
public Response<String> download() {
|
||||
return Response.success(userLikeGroupService.download());
|
||||
}
|
||||
|
||||
@ApiOperation(value = "productImageInitialize")
|
||||
@PostMapping("/productImageInitialize")
|
||||
public Response<Boolean> productImageUpload(@Valid @RequestBody ProductImageInitializeDTO productImageInitializeDTO) {
|
||||
|
||||
Reference in New Issue
Block a user