From 1f9b64476716a6a1de3bcb886bf4e64b123f7523 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 06 七月 2023 18:28:31 +0800
Subject: [PATCH] 管理台bug和用户端活动商品购买

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/FinishOrder.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/FinishOrder.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/FinishOrder.java
index 554020c..6a12c8c 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/FinishOrder.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/FinishOrder.java
@@ -31,7 +31,7 @@
      * 完结id
      */
     @TableId("finish_id")
-    private Integer finishId;
+    private Long finishId;
     /**
      * 删除标记
      */
@@ -41,7 +41,7 @@
      * 商户id
      */
     @TableField("shop_id")
-    private Integer shopId;
+    private Long shopId;
     /**
      * 订单id
      */

--
Gitblit v1.7.1