Merge branch 'master' of http://124.220.229.80:9093/root/cif

cif-service/src/main/java/com/txz/cif/web/bo/UserInfoBO.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.persistence.Column;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -14,110 +13,108 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@ApiModel(value="用户资料")
+@ApiModel(value = "用户资料")
 public class UserInfoBO {
-    @ApiModelProperty(value="userId")
+    @ApiModelProperty(value = "userId")
     private Long userId;
-
-
+    
+    
     /**
      * 名字
      */
-    @ApiModelProperty(value="name名字")
+    @ApiModelProperty(value = "name名字")
     private String name;
-
+    
     private String habit;
-
-
-
+    
+    private String invitedCode;
+    
     /**
      * 状态  1正常 2禁止提现 3禁止登录 4禁止下单
      */
-    @ApiModelProperty(value="状态  1正常 2禁止提现 3禁止登录 4禁止下单")
+    @ApiModelProperty(value = "状态  1正常 2禁止提现 3禁止登录 4禁止下单")
     private Byte status;
-
-
-    @ApiModelProperty(value="phoneNo电话")
+    
+    
+    @ApiModelProperty(value = "phoneNo电话")
     private String phoneNo;
-
-    @ApiModelProperty(value="用户编码")
+    
+    @ApiModelProperty(value = "用户编码")
     private String userNo;
-
-
-
-    @ApiModelProperty(value="语言")
-    private String  language;
-
-
-
+    
+    
+    @ApiModelProperty(value = "语言")
+    private String language;
+    
+    
     /**
      * 头像
      */
-    @ApiModelProperty(value="头像")
+    @ApiModelProperty(value = "头像")
     private String headPic;
-
+    
     /**
      * 居住地址
      */
-    @ApiModelProperty(value="address居住地址")
+    @ApiModelProperty(value = "address居住地址")
     private String address;
-
+    
     /**
      * 性别 0未知 1男 2女
      */
-    @ApiModelProperty(value="sex性别 0未知 1男 2女")
+    @ApiModelProperty(value = "sex性别 0未知 1男 2女")
     private Byte sex;
-
+    
     /**
      * 所属省份代码
      */
-    @ApiModelProperty(value="provinceCode所属省份代码")
+    @ApiModelProperty(value = "provinceCode所属省份代码")
     private String provinceCode;
-
+    
     /**
      * 所属城市码
      */
-    @ApiModelProperty(value="cityCode所属城市码")
+    @ApiModelProperty(value = "cityCode所属城市码")
     private String cityCode;
-
+    
     /**
      * 所属区域代码
      */
-    @ApiModelProperty(value="areaCode所属区域代码")
+    @ApiModelProperty(value = "areaCode所属区域代码")
     private String areaCode;
-
-    @ApiModelProperty(value="站内信id")
+    
+    @ApiModelProperty(value = "站内信id")
     private String sseId;
-
-    @ApiModelProperty(value="会员等级配置")
-    private  List<ConfigMember> memberLevels;
-
-    @ApiModelProperty(value="会员等级配置")
+    
+    @ApiModelProperty(value = "会员等级配置")
+    private List<ConfigMember> memberLevels;
+    
+    @ApiModelProperty(value = "会员等级配置")
     private Integer level;
-
-    @ApiModelProperty(value="当前邀请人数")
+    
+    @ApiModelProperty(value = "当前邀请人数")
     private Integer invitedNo;
-
-    @ApiModelProperty(value="下级邀请人数")
+    
+    @ApiModelProperty(value = "下级邀请人数")
     private Integer nextInvitedNo;
-
-    @ApiModelProperty(value="团队人数")
+    
+    @ApiModelProperty(value = "团队人数")
     private Integer teamNo;
-
-
-    @ApiModelProperty(value="7日收益")
+    
+    
+    @ApiModelProperty(value = "7日收益")
     private BigDecimal L7DEarnings;
-
-
-    @ApiModelProperty(value="银行")
+    
+    
+    @ApiModelProperty(value = "银行")
     private String bank;
-
+    
     /**
      * 用户名
      */
-    @ApiModelProperty(value="银行账号姓名")
+    @ApiModelProperty(value = "银行账号姓名")
     private String bankAccountName;
-
-    @ApiModelProperty(value="银行")
+    
+    @ApiModelProperty(value = "银行")
     private String bankAccount;
 }