From 938d37e96dc00f8fc3c7036d818e87d51624e0a9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Mar 2022 15:34:01 +0800
Subject: [PATCH] Merge branch 'developer' into alpha

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

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSearchRecord.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSearchRecord.java
index d9a1283..a3196af 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSearchRecord.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSearchRecord.java
@@ -22,7 +22,7 @@
 	/**
 	 * 用户id
 	 */
-	private String  userId;
+	private Long  userId;
 			
 	
 	/**
@@ -84,11 +84,11 @@
 	}
    	
 
-	public String getUserId() {
+	public Long getUserId() {
 		return userId;
 	}
    	
-   	public void setUserId(String userId) {
+   	public void setUserId(Long userId) {
 		this.userId=userId;
 	}
    	

--
Gitblit v1.9.1