From 0883b709d59a21fcd930208387be9ea07076886a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 八月 2024 17:11:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/dao/business/model/Company.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
index ccf1673..abecdd5 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -190,6 +190,9 @@
@ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆璺緞", example = "1")
@TableField(exist = false)
private String parentCompanyPath;
+ @ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆绫诲瀷 0鐩稿叧鏂� 1鍐呴儴缁勭粐", example = "1")
+ @TableField(exist = false)
+ private String parentType;
@ApiModelProperty(value = "erp閮ㄩ棬绾у埆璺緞", example = "1")
@ExcelColumn(name="erp閮ㄩ棬绾у埆璺緞")
private String erpCompanyPath;
--
Gitblit v1.9.3