From aafd58ca236ea5f9b66d9759121053c16fb87fe6 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 11 Sep 2021 17:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' 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