From b8abd1c4081c2c67c1f258b9956f4c60652d831d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 17:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderVO.java
index 71bacf4..ed34770 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderVO.java
@@ -31,8 +31,5 @@
     @ApiModelProperty(value = "实际支付价格")
     private BigDecimal paymentAmount;
 
-    @ApiModelProperty(value = "快递费")
-    private BigDecimal expressAmount;
-
 
 }

--
Gitblit v1.7.1