From 6c40e04eb7c2060feb2533735cd3089d438965e5 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 19 三月 2024 17:19:36 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 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 875d8cd..b7a30a9 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
@@ -10,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 浼佷笟淇℃伅琛�
@@ -85,7 +86,7 @@
@ApiModelProperty(value = "浼佷笟浠ｇ爜")
@ExcelColumn(name="浼佷笟浠ｇ爜")
- private Integer code;
+ private String code;
@ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
@ExcelColumn(name="涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
@@ -103,8 +104,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 +115,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;
@@ -160,4 +165,22 @@
@TableField(exist = false)
private String headPhone;
+ @ApiModelProperty(value = "涓婄骇缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ private String parentName;
+ @ApiModelProperty(value = "娴峰悍涓婄骇缁勭粐")
+ private String hkParentId;
+
+ @TableField(exist = false)
+ private List<Company> childList;
+
+ @ApiModelProperty(value = "娴峰悍閮ㄩ棬绾у埆璺緞", example = "1")
+ @ExcelColumn(name="娴峰悍閮ㄩ棬绾у埆璺緞")
+ private String hk_company_path;
+ @ApiModelProperty(value = "鑷缓閮ㄩ棬绾у埆璺緞", example = "1")
+ @ExcelColumn(name="鑷缓閮ㄩ棬绾у埆璺緞")
+ private String company_path;
+ @ApiModelProperty(value = "erp閮ㄩ棬绾у埆璺緞", example = "1")
+ @ExcelColumn(name="erp閮ㄩ棬绾у埆璺緞")
+ private String erp_company_path;
}
--
Gitblit v1.9.3