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/Article.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/Article.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/Article.java index 11d512f..c1cdda4 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/bean/Article.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/Article.java @@ -96,14 +96,14 @@ */ private Integer commentNum; - private Long shopId; + private Long companyId; - public Long getShopId() { - return shopId; + public Long getCompanyId() { + return companyId; } - public void setShopId(Long shopId) { - this.shopId = shopId; + public void setCompanyId(Long companyId) { + this.companyId = companyId; } public Integer getCommentNum() { -- Gitblit v1.9.1