From d70c240e09a9021824cc9e9f1bed8028a0c194cd Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 04 Sep 2025 15:31:05 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java b/oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java
index 028d5cf..a6270c2 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java
@@ -32,8 +32,8 @@
private BigDecimal promotionAmount = BigDecimal.ZERO;
@ApiModelProperty(value = "优惠卷待定")
private Object coupon;
- @ApiModelProperty(value = "运费待定")
- private Object shippingFee;
- @ApiModelProperty(value = "打包费待定")
- private Object packingCharges;
+ @ApiModelProperty(value = "配送费")
+ private BigDecimal deliveryPrice = BigDecimal.ZERO;
+ @ApiModelProperty(value = "打包费")
+ private BigDecimal packagingPrice = BigDecimal.ZERO;
}
--
Gitblit v1.9.3