From 63170eb558babf81890cb23a453680e1054ecf85 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 09 Apr 2021 17:48:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopDeliveryInfo.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopDeliveryInfo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopDeliveryInfo.java
index 75f2487..5bd8247 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopDeliveryInfo.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopDeliveryInfo.java
@@ -61,7 +61,7 @@
/**
* 用户ID
*/
- private String userId;
+ private Long userId;
/**
@@ -196,16 +196,14 @@
public void setOrderId(Integer orderId) {
this.orderId=orderId;
}
-
- public String getUserId() {
+ public Long getUserId() {
return userId;
}
-
- public void setUserId(String userId) {
- this.userId=userId;
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
}
-
public String getOrderNo() {
return orderNo;
--
Gitblit v1.9.1