From 3f7a3aefe2965459aed169383b285fba400cfe8c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 04 六月 2023 13:13:54 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopFundRecord.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopFundRecord.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopFundRecord.java
index f624424..8e8a6ad 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopFundRecord.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopFundRecord.java
@@ -42,7 +42,7 @@
* 商户id
*/
@TableField("shop_id")
- private Integer shopId;
+ private Long shopId;
/**
* 记录类型1订单支付2取消订单3
*/
@@ -72,7 +72,7 @@
* 关联用户id
*/
@TableField("relation_user_id")
- private Integer relationUserId;
+ private Long relationUserId;
/**
* 关联订单id
*/
--
Gitblit v1.7.1