From 1b51c3e64ba8117900d594fcd5b677336e4759bc Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 25 Mar 2021 14:17:38 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move
---
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