From 512a2f0fb09b663b8de19b5313c8bd5899f4f74b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 09:44:06 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopShoppingCart.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopShoppingCart.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopShoppingCart.java
index e39c2d4..4f27e07 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopShoppingCart.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopShoppingCart.java
@@ -35,7 +35,7 @@
 	/**
 	 * 用户ID
 	 */
-	private String  cartUserId;
+	private Long  cartUserId;
 
 
 	/**
@@ -298,11 +298,11 @@
 	}
 
 
-	public String getCartUserId() {
+	public Long getCartUserId() {
 		return cartUserId;
 	}
 
-	public void setCartUserId(String cartUserId) {
+	public void setCartUserId(Long cartUserId) {
 		this.cartUserId=cartUserId;
 	}
 

--
Gitblit v1.9.1