Merge branch 'dev/dev_xp' into dev/3.1_release_merge

# Conflicts:
#	src/main/java/com/ai/da/python/PythonService.java
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java

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

@@ -12,10 +12,13 @@ public class PoseTransformDTO {
     @ApiModelProperty("项目id")
     private Long projectId;
 
-    @ApiModelProperty("图片的minio地址")
+    @ApiModelProperty("图片的minio地址 | 首帧图片的minio地址")
     @NotBlank(message = "please select a product image")
     private String productImage;
 
+    @ApiModelProperty("尾帧图片的minio地址")
+    private String lastFrameProductImage;
+
     @ApiModelProperty("pose的编号")
     @NotNull(message = "please select a pose")
     private Integer poseId;
@@ -31,4 +34,10 @@ public class PoseTransformDTO {
 
     @ApiModelProperty("是否默认喜欢")
     private Boolean isDefaultLike;
+
+    @ApiModelProperty("动作描述")
+    private String prompt;
+
+    @ApiModelProperty("生成模式 1.pose2video | 2.prompt2video | 3.FLFrame2video ")
+    private int mode;
 }