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

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

@@ -3,13 +3,12 @@ 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;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
+import java.util.Map;
 
 @AllArgsConstructor
 @NoArgsConstructor
@@ -68,4 +67,10 @@ public class AccountLoginVO {
     // 是否是affiliate
     private boolean isAffiliate = false;
 
+    private String country;
+
+    private String occupation;
+
+    private Map<String, Long> usernameModify;
+
 }