From c64da5152d32c366eecfb20b3fdc023be1d27681 Mon Sep 17 00:00:00 2001 From: tangxiaobao <303826152@qq.com> Date: 星期三, 14 七月 2021 15:26:19 +0800 Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java | 33 ++++++++++++++++++++++++--------- 1 files changed, 24 insertions(+), 9 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java index 967fdcb..0b42ea1 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java @@ -1,9 +1,12 @@ package com.panzhihua.common.model.vos.community; import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @description: 批量导入车辆管理 @@ -22,24 +25,36 @@ */ @ExcelProperty(value = "车主姓名" ,index = 1) private String userName; + /** - * 联系方式 + * 品牌型号 */ - @ExcelProperty(value = "联系方式" ,index = 2) - private String mobile; + @ExcelProperty(value = "品牌型号" ,index = 2) + private String brand; + /** * 车牌号 */ @ExcelProperty(value = "车牌号" ,index = 3) private String plateNum; - /** - * 品牌型号 - */ - @ExcelProperty(value = "品牌型号" ,index = 4) - private String brand; + /** * 车身颜色 */ - @ExcelProperty(value = "车身颜色" ,index = 5) + @ExcelProperty(value = "颜色" ,index = 4) private String color; + + /** + * 联系方式 + */ + @ExcelProperty(value = "联系方式" ,index = 5) + private String mobile; + + /** + * 详细住址 + */ + @ExcelProperty(value = "详细住址" ,index = 6) + private String address; + } + -- Gitblit v1.7.1