From a6d6627a6e13aef60941337a270541f507d53ba7 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 15 十二月 2023 09:36:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 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..c69f152 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 @@ -114,6 +114,7 @@ @ApiModelProperty(value = "ERP鏍囪瘑") @ExcelColumn(name="ERP鏍囪瘑") private String erpId; + @ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)") @ExcelColumn(name="璐熻矗浜虹紪鐮�") private String headId; @@ -160,4 +161,9 @@ @TableField(exist = false) private String headPhone; + @ApiModelProperty(value = "涓婄骇缁勭粐鍚嶇О") + @TableField(exist = false) + private String parentName; + + } -- Gitblit v1.9.3