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/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;
 }