From deb4575b72443cf906946a9fb28a557c16556fb9 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 01 十一月 2024 09:30:50 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/yunyibao into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/CompanyDepartment.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CompanyDepartment.java b/server/service/src/main/java/com/doumee/dao/business/model/CompanyDepartment.java
index 833c2ab..cba61b8 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CompanyDepartment.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CompanyDepartment.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 浼佷笟淇℃伅琛�
@@ -16,7 +18,7 @@
* @date 2024/10/28 19:16
*/
@Data
-@ApiModel("浼佷笟淇℃伅琛�")
+@ApiModel("缁勭粐淇℃伅琛�")
@TableName("`company_department`")
public class CompanyDepartment {
@@ -67,8 +69,8 @@
@ExcelColumn(name="鍥炬爣")
private String imgurl;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
+ @ApiModelProperty(value = "绫诲瀷 0骞冲彴缁勭粐 1浼佷笟缁勭粐 2鍟嗘埛缁勭粐", example = "1")
+ @ExcelColumn(name="绫诲瀷 0骞冲彴缁勭粐 1浼佷笟缁勭粐 2鍟嗘埛缁勭粐")
private Integer type;
@ApiModelProperty(value = "浼佷笟浠ｇ爜", example = "1")
@@ -77,7 +79,7 @@
@ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
@ExcelColumn(name="涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
- private String parentId;
+ private Integer parentId;
@ApiModelProperty(value = "鑱旂郴浜哄鍚�")
@ExcelColumn(name="鑱旂郴浜哄鍚�")
@@ -101,6 +103,26 @@
@ApiModelProperty(value = "鎵�灞炰紒涓氱紪鐮�")
@ExcelColumn(name="鎵�灞炰紒涓氱紪鐮�")
- private String companyId;
+ private Integer companyId;
+ @TableField(exist = false)
+ private List<CompanyDepartment> childList;
+ @ApiModelProperty(value = "璐熻矗浜哄悕瀛�")
+ @TableField(exist = false)
+ private String headName;
+ @ApiModelProperty(value = "鎿嶄綔浜哄悕瀛�")
+ @TableField(exist = false)
+ private String editorName;
+ @ApiModelProperty(value = "璐熻矗浜烘墜鏈哄彿")
+ @TableField(exist = false)
+ private String headPhone;
+ @ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆璺緞", example = "1")
+ @TableField(exist = false)
+ private String parentCompanyPath;
+ @ApiModelProperty(value = "鐖剁骇閮ㄩ棬鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String parentName;
+ @ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆绫诲瀷 0鐩稿叧鏂� 1鍐呴儴缁勭粐", example = "1")
+ @TableField(exist = false)
+ private String parentType;
}
--
Gitblit v1.9.3