From 241a49f9653aa83d1dcd9bf646208da3157df35a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 05 Apr 2021 22:48:14 +0800
Subject: [PATCH] 合并BizUser表与SysVipInfo表 大部分逻辑已经修正 可能存在问题的 1、拼团秒杀 2、分享图 3、分销结算

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