From 1d8b7df974e1fbdacff7632b05bdc30d78a6a8c1 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 25 Oct 2021 13:30:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopRefundRecord.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopRefundRecord.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopRefundRecord.java
index 60bb61e..b557b04 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopRefundRecord.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopRefundRecord.java
@@ -40,7 +40,7 @@
/**
* 用户ID
*/
- private String userId;
+ private Long userId;
/**
@@ -301,11 +301,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