Commit ce32262c authored by tangwei's avatar tangwei

解决冲突

parents 92fa4355 961cf414
......@@ -7,43 +7,43 @@ import lombok.Data;
@Data
public class HouseholdPvImport {
@ColumnWidth(15)
@ExcelProperty(value = "所属场站", index = 1)
@ExcelProperty(value = "所属场站", index = 0)
private String platformCompanyId;
@ColumnWidth(15)
@ExcelProperty(value = "乡镇", index = 2)
@ExcelProperty(value = "乡镇", index = 1)
private String districtId;
@ColumnWidth(15)
@ExcelProperty(value = "户号", index = 3)
@ExcelProperty(value = "户号", index = 2)
private String number;
@ColumnWidth(15)
@ExcelProperty(value = "户主姓名", index = 4)
@ExcelProperty(value = "户主姓名", index = 3)
private String name;
@ColumnWidth(15)
@ExcelProperty(value = "性别", index = 5)
@ExcelProperty(value = "性别", index = 4)
private String sex;
@ColumnWidth(15)
@ExcelProperty(value = "身份证号", index = 6)
@ExcelProperty(value = "身份证号", index = 5)
private String idNumber;
@ColumnWidth(20)
@ExcelProperty(value = "证件过期时间", index = 7)
@ExcelProperty(value = "证件过期时间", index = 6)
private String expiryTime;
@ColumnWidth(15)
@ExcelProperty(value = "签发机关", index = 8)
@ExcelProperty(value = "签发机关", index = 7)
private String issuingAuthority;
@ColumnWidth(15)
@ExcelProperty(value = "户籍地址", index = 9)
@ExcelProperty(value = "户籍地址", index = 8)
private String residenceAddress;
@ColumnWidth(15)
@ExcelProperty(value = "手机号码", index = 10)
@ExcelProperty(value = "手机号码", index = 9)
private String phone;
@ColumnWidth(15)
@ExcelProperty(value = "居住地", index = 11)
@ExcelProperty(value = "居住地", index = 10)
private String address;
@ColumnWidth(15)
@ExcelProperty(value = "居住地邮编", index = 12)
@ExcelProperty(value = "居住地邮编", index = 11)
private String postcode;
@ColumnWidth(15)
@ExcelProperty(value = "送达地址", index = 13)
@ExcelProperty(value = "送达地址", index = 12)
private String serviceAddress;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment