From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
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