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/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