diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java index 3b036ab5b..c32da0048 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -61,7 +61,7 @@ public class AsyncTask { public void importExcelData(File file, MallUserInfo user, String importKey, String tenantId) { ImportParams params = new ImportParams(); // 需要验证 - params.setImportFields(new String[]{"姓名", "性别", "手机号*", "微信昵称", "学历", "生日", "积分", "地址", "上次活跃时间", "注册时间", "标签", "成长值"}); + params.setImportFields(new String[]{"姓名", "性别", "手机号*", "微信昵称", "学历", "生日", "地址", "上次活跃时间", "注册时间", "标签", "成长值", "积分"}); IExcelDataHandler handler = new AsyncTask.UserExcelHandler(); handler.setNeedHandlerFields(new String[]{"手机号*"}); params.setNeedVerify(true); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java b/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java index dae49e3aa..a94ae30bc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java @@ -31,26 +31,26 @@ public class CUserBaseInfoT implements Serializable { @Excel(name="生日",width = 20,orderNum = "6") @io.swagger.annotations.ApiModelProperty(value="出生日期",name="birthdate") private String birthdate; - @Excel(name="积分",width = 20,orderNum = "7") + @Excel(name = "积分", width = 20, orderNum = "12") @io.swagger.annotations.ApiModelProperty(value="积分",name="credit") private String credit; - @Excel(name="地址",width = 20,orderNum = "8") + @Excel(name = "地址", width = 20, orderNum = "7") @io.swagger.annotations.ApiModelProperty(value="地址",name="address") private String address; - @Excel(name="上次活跃时间",width = 20, orderNum = "9") + @Excel(name = "上次活跃时间", width = 20, orderNum = "8") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private String updateDate; - @Excel(name="注册时间",width = 20, orderNum = "10") + @Excel(name = "注册时间", width = 20, orderNum = "9") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private String createDate; @Transient - @Excel(name="标签",width = 20,orderNum = "11") + @Excel(name = "标签", width = 20, orderNum = "10") private String tagNames; @Transient - @Excel(name="成长值",width = 20,orderNum = "12") + @Excel(name = "成长值", width = 20, orderNum = "11") private String poins; }