Merge branch 'refs/heads/dev/dev' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/common/utils/SendEmailUtil.java
#	src/main/java/com/ai/da/mapper/primary/entity/Account.java

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

@@ -32,4 +32,6 @@ public class AccountLoginDTO {
     @ApiModelProperty("邮箱验证码")
     private String emailVerifyCode;
 
+    private String organizationName;
+
 }

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

@@ -0,0 +1,12 @@
+package com.ai.da.model.dto;
+
+import com.ai.da.mapper.primary.entity.Account;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AddSubAccountDTO extends Account {
+
+    private List<Long> deleteIdList;
+}

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

@@ -63,4 +63,8 @@ public class DesignCollectionDTO {
 
     private String moodboardPostion;
 
+    private List<String> requestIdList;
+
+    private Integer designNum;
+
 }

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

@@ -29,12 +29,15 @@ public class GenerateToPythonDTO {
 
     private String svg;
 
-    public GenerateToPythonDTO(String tasks_id, String prompt, String image_url, String mode, String category, String gender) {
+    private String version;
+
+    public GenerateToPythonDTO(String tasks_id, String prompt, String image_url, String mode, String category, String gender, String version) {
         this.image_url = image_url;
         this.category = category;
         this.prompt = prompt;
         this.mode = mode;
         this.tasks_id = tasks_id;
         this.gender = gender;
+        this.version = version;
     }
 }

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

@@ -0,0 +1,10 @@
+package com.ai.da.model.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ProductImageInitializeDTO {
+    private List<Long> libraryIds;
+}

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

@@ -33,7 +33,7 @@ public class ReDesignCollectionDTO {
     @ApiModelProperty("市场手稿板图片id  数组")
     private List<DesignCollectionElementDTO> marketingSketchs;
 
-    @NotNull(message = "colorBoards.cannot.be.empty")
+    @NotNull(message = "systemScale.cannot.be.empty")
     @ApiModelProperty("系统取图比列")
     private BigDecimal systemScale;
 
@@ -67,4 +67,8 @@ public class ReDesignCollectionDTO {
     private String moodboardPosition;
 
     private String moodTemplateId;
+
+    private List<String> requestIdList;
+
+    private Integer designNum;
 }

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

@@ -0,0 +1,9 @@
+package com.ai.da.model.dto;
+
+import com.ai.da.model.vo.PageQueryBaseVo;
+import lombok.Data;
+
+@Data
+public class SubAccountPageDTO extends PageQueryBaseVo {
+    private String userName;
+}

src/main/java/com/ai/da/model/vo/AccountLoginVO.java

@@ -1,5 +1,6 @@
 package com.ai.da.model.vo;
 
+import com.ai.da.mapper.primary.entity.AccountExtend;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.models.auth.In;
@@ -8,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @AllArgsConstructor
 @NoArgsConstructor
@@ -40,4 +42,6 @@ public class AccountLoginVO {
 
     private Long followerCount;
 
+    private List<AccountExtend> accountExtendList;
+
 }

src/main/java/com/ai/da/model/vo/DesignCollectionItemVO.java

@@ -22,6 +22,8 @@ public class DesignCollectionItemVO {
     @ApiModelProperty("t_design_python_outfit id")
     private String designOutfitUrl;
 
+    private String objectSign;
+
     public DesignCollectionItemVO() {
 
     }

src/main/java/com/ai/da/model/vo/DesignCollectionVO.java

@@ -23,6 +23,8 @@ public class DesignCollectionVO {
 
     private String processId;
 
+    private List<String> UnfinishedList;
+
     public DesignCollectionVO() {
     }
 }

src/main/java/com/ai/da/model/vo/GoogleTokenResponse.java

@@ -6,5 +6,8 @@ import lombok.Data;
 public class GoogleTokenResponse {
     private String accessToken;
     private String idToken;
+    private long expiresIn;
+    private String tokenType;
+    private String scope;
 
 }

src/main/java/com/ai/da/model/vo/ValidateElementVO.java

@@ -47,4 +47,8 @@ public class ValidateElementVO {
     private String modelSex;
 
     private String style;
+
+    private List<String> requestIdList;
+
+    private Integer designNum;
 }