From 2e7ba2bc0fbefa6ee0b44eaf1990a493795efe4a Mon Sep 17 00:00:00 2001 From: lishuai <260038442@qq.com> Date: 星期二, 26 十二月 2023 16:33:36 +0800 Subject: [PATCH] 导出字段对接调整提交 --- server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java index d947c43..9c51476 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java +++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java @@ -85,7 +85,7 @@ @ApiModelProperty(value = "浼佷笟浠g爜") @ExcelColumn(name="浼佷笟浠g爜") - private Integer code; + private String code; @ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�") @ExcelColumn(name="涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�") @@ -103,8 +103,8 @@ @ExcelColumn(name="娴峰悍鏍囪瘑") private String hkId; - @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�") - @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�") + @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触") + @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触") private Integer hkStatus; @ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�") @@ -114,6 +114,10 @@ @ApiModelProperty(value = "ERP鏍囪瘑") @ExcelColumn(name="ERP鏍囪瘑") private String erpId; + @ApiModelProperty(value = "ERP鐖剁骇缁勭粐鏍囪瘑") + @ExcelColumn(name="ERP鐖剁骇缁勭粐鏍囪瘑") + private String erpParentId; + @ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)") @ExcelColumn(name="璐熻矗浜虹紪鐮�") private String headId; @@ -163,6 +167,9 @@ @ApiModelProperty(value = "涓婄骇缁勭粐鍚嶇О") @TableField(exist = false) private String parentName; + @ApiModelProperty(value = "娴峰悍涓婄骇缁勭粐") + @TableField(exist = false) + private String hkParentId; } -- Gitblit v1.9.3