From 6d47ae98e2cc860299bfb976bec226d99a0bcd1b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 12 Mar 2021 11:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java
index 29865be..ca48c7e 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java
@@ -244,6 +244,8 @@
 
 	private Long companyId;
 
+
+
 	public Long getCompanyId() {
 		return companyId;
 	}

--
Gitblit v1.9.1