Merge branch 'dev/dev_xp' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/model/vo/MagicToolResultVO.java

src/main/java/com/ai/da/controller/GenerateController.java

@@ -173,7 +173,7 @@ public class GenerateController {
     @GetMapping("/getAnimateResult")
     public Response<PoseTransformationVO> getAnimateResult(@RequestParam("taskId") String taskId){
         return Response.success(generateService.getAnimateResult(taskId));
-    }*/
+    }
 
     @ApiOperation(value = "freepik toProductImage")
     @GetMapping("/reimagineFreePik")
@@ -187,7 +187,7 @@ public class GenerateController {
     @GetMapping("/getImageDescription")
     public Response<String> getImageDescription(@RequestParam("path") String path) {
         return Response.success(generateService.getImageDescription(path));
-    }
+    }*/
 
 //    @ApiOperation(value = "试用flux")
 //    @GetMapping("/flux")