diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index bd30edfba..4e136566d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -25,6 +25,7 @@ import java.util.Objects; @EqualsAndHashCode(callSuper = true) public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { + @Excel(name="会员码",width = 20,orderNum = "1") protected Long id; @JsonIgnore @@ -44,45 +45,45 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { return shardFinalTableSuffix; } - @Excel(name="姓名",width = 20,orderNum = "1") + @Excel(name="姓名",width = 20,orderNum = "2") @NotNull @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") private String name; - @Excel(name="性别",width = 20,replace = { "保密_0", "男_1", "女_2"},orderNum = "2") + @Excel(name="性别",width = 20,replace = { "保密_0", "男_1", "女_2"},orderNum = "3") @NotNull @io.swagger.annotations.ApiModelProperty(value="性别:0:保密 1.男 2女",name="sex") private Integer sex; - @Excel(name = "手机号*", width = 20, orderNum = "3") + @Excel(name = "手机号*", width = 20, orderNum = "4") @io.swagger.annotations.ApiModelProperty(value="微信用户绑定的手机号",name="phone") @NotNull private String phone; - @Excel(name="微信昵称",width = 20,orderNum = "4") + @Excel(name="微信昵称",width = 20,orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="用户昵称",name="nickName") private String nickName; @io.swagger.annotations.ApiModelProperty(value="用户头像地址",name="avatarUrl") private String avatarUrl; - @Excel(name="学历",width = 20,orderNum = "5") + @Excel(name="学历",width = 20,orderNum = "6") @NotNull @io.swagger.annotations.ApiModelProperty(value="学历",name="education") private String education; - @Excel(name="生日",width = 20,format="yyyy-MM-dd",orderNum = "6") + @Excel(name="生日",width = 20,format="yyyy-MM-dd",orderNum = "7") @NotNull @io.swagger.annotations.ApiModelProperty(value="出生日期",name="birthdate") private Date birthdate; - @Excel(name="地址",width = 20,orderNum = "7") + @Excel(name="地址",width = 20,orderNum = "8") @TableField(exist = false) private String addressStr; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - @Excel(name="上次活跃时间",width = 20,format="yyyy-MM-dd", orderNum = "8") + @Excel(name="上次活跃时间",width = 20,format="yyyy-MM-dd", orderNum = "9") @io.swagger.annotations.ApiModelProperty(value="上次活跃时间",name="activeTime") private Date activeTime; @TableField(exist = false) @@ -90,7 +91,7 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { @TableField(exist = false) private Date activeEndTime; - @Excel(name="注册时间",width = 20,format="yyyy-MM-dd", orderNum = "9") + @Excel(name="注册时间",width = 20,format="yyyy-MM-dd", orderNum = "10") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @@ -117,12 +118,12 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { @io.swagger.annotations.ApiModelProperty(value="积分",name="credit") private Integer credit; - @Excel(name="扣减总积分",width = 20, orderNum = "12") + @Excel(name="扣减总积分",width = 20, orderNum = "13") @io.swagger.annotations.ApiModelProperty(value="扣减积分",name="lesCredit") @TableField(exist = false) private Integer lesCredit; - @Excel(name="增长总积分",width = 20, orderNum = "12") + @Excel(name="增长总积分",width = 20, orderNum = "14") @io.swagger.annotations.ApiModelProperty(value="增加积分",name="addCredit") @TableField(exist = false) private Integer addCredit; @@ -149,7 +150,7 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { } @TableField(exist = false) - @Excel(name="标签",width = 50,orderNum = "10") + @Excel(name="标签",width = 50,orderNum = "15") private String tagNames;