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/mapper/primary/entity/Affiliate.java

@@ -30,4 +30,6 @@ public class Affiliate extends BaseEntity{
     private String link;
 
     private String promotionMethod;
+
+    private Integer isDeleted;
 }

src/main/java/com/ai/da/mapper/primary/entity/Library.java

@@ -97,4 +97,16 @@ public class Library implements Serializable {
         this.md5 = md5;
         this.createDate = createDate;
     }
+
+    public Library(Long accountId, String level1Type, String level2Type, String level3Type, String ageGroup, String name, String url, String md5, Date createDate) {
+        this.accountId = accountId;
+        this.level1Type = level1Type;
+        this.level2Type = level2Type;
+        this.level3Type = level3Type;
+        this.ageGroup = ageGroup;
+        this.name = name;
+        this.url = url;
+        this.md5 = md5;
+        this.createDate = createDate;
+    }
 }

src/main/java/com/ai/da/mapper/primary/entity/PoseTransformation.java

@@ -20,6 +20,8 @@ public class PoseTransformation extends BaseEntity {
 
     private String productImage;
 
+    private String lastFrameProductImage;
+
     private int poseId;
 
     private String gifUrl;
@@ -37,6 +39,8 @@ public class PoseTransformation extends BaseEntity {
 
     private String taskStatus;
 
+    private String prompt;
+
     public PoseTransformation() {
     }