Merge remote-tracking branch 'origin/dev/dev' into dev/dev

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

@@ -2,23 +2,27 @@ package com.ai.da.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 @Data
 @ApiModel("AccountAdd")
+@AllArgsConstructor
 public class AccountAddDTO {
 
     @NotBlank(message = "email.cannot.be.empty")
-    @ApiModelProperty("email")
-    private String email;
+    @ApiModelProperty("userEmail")
+    private String userEmail;
 
     @NotBlank(message = "userName.cannot.be.empty")
     @ApiModelProperty("userName")
     private String userName;
 
+    private String country;
+
     @NotBlank(message = "validStartTime.cannot.be.empty")
     @ApiModelProperty("Start time of account validity ")
     private String validStartTime;
@@ -29,4 +33,8 @@ public class AccountAddDTO {
 
     private Integer isTrial;
 
+    private BigDecimal credits;
+
+    private Integer systemUser;
+
 }

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

@@ -55,6 +55,6 @@ public class GenerateThroughImageTextDTO {
     @ApiModelProperty("页面上用户设计的slogan所截的图片")
     String sloganBase64;
 
-    @ApiModelProperty("种子 取值范围 0~99999")
+    @ApiModelProperty("种子 取值范围 0~500")
     String seed;
 }

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

@@ -0,0 +1,57 @@
+package com.ai.da.model.vo;
+
+import lombok.Data;
+import java.util.List;
+
+@Data
+public class QuestionnaireVO {
+    /**
+     * 用户名
+     */
+    private String userName;
+    /**
+     * 用户性别
+     */
+    private String gender;
+    /**
+     * 职业
+     */
+    private String occupation;
+    /**
+     * 国家
+     */
+    private String country;
+    /**
+     * 电子邮件
+     */
+    private String email;
+    /**
+     * 年龄区间
+     */
+    private String age;
+    /**
+     * How has AiDA been helpful to you?
+     */
+    private List<String> helpful;
+    /**
+     * What do you think AiDA should improve?
+     */
+    private List<String> improve;
+    /**
+     *  Will you subscribe to AiDA 3.0
+     */
+    private String isSubscribe;
+    /**
+     * If NO, please share why:
+     */
+    private List<String> reasonForNotSubscribe;
+    /**
+     *  Are you currently using any design tools?
+     */
+    private String designTools;
+    /**
+     * 用户所选语言
+     */
+    private String language;
+
+}