From cd98b1a8bb6f175b964e222d6c61130bfbd10992 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期二, 18 三月 2025 09:08:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'lfl/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java
index 6059977..b0f3b64 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java
@@ -128,5 +128,4 @@
     @TableField("integral")
     private Integer integral;
 
-
 }

--
Gitblit v1.7.1