From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 27 May 2022 19:48:02 +0800 Subject: [PATCH] Merge branch 'developer' into hive2.0 --- zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java index 884b2c7..fc2cee1 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java @@ -56,6 +56,10 @@ private String type; private Long shopId; + + private String parentIds; + + private Long companyId; /** * 扩展属性 @@ -81,6 +85,15 @@ public void setArticle(Article article) { this.article = article; }*/ + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + public Long getId() { return id; } @@ -159,6 +172,14 @@ this.type=type; } + public String getParentIds() { + return parentIds; + } + + public void setParentIds(String parentIds) { + this.parentIds = parentIds; + } + @Override public String toString() { return "ArticleType [id=" + id + ", articleTypeName=" + articleTypeName -- Gitblit v1.9.1