From 0ab1b864458f36b294933112824b10b13770915e Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 07 七月 2023 21:12:43 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderRefund.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderRefund.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderRefund.java
index eda0c00..e15e486 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderRefund.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderRefund.java
@@ -46,7 +46,7 @@
      * 售后id
      */
     @TableField("after_sales_id")
-    private Integer afterSalesId;
+    private String afterSalesId;
     /**
      * 订单id
      */
@@ -56,12 +56,12 @@
      * 用户id
      */
     @TableField("user_id")
-    private Integer userId;
+    private Long userId;
     /**
      * 商户id
      */
     @TableField("shop_id")
-    private Integer shopId;
+    private Long shopId;
     /**
      * 退款金额
      */

--
Gitblit v1.7.1