From ab0637e981ab4c85120ccde35ee24ec4abbe3e24 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 17 Oct 2025 17:20:15 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into xin
---
oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturn.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturn.java b/oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturn.java
index 988d692..e6d3787 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturn.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturn.java
@@ -59,6 +59,10 @@
private String orderStoreNum;
@NotNull
+ @ApiModelProperty(value = "打包费")
+ private BigDecimal packagingPrice;
+
+ @NotNull
@ApiModelProperty(value = "配送费")
private BigDecimal sendPrice;
@@ -111,7 +115,7 @@
@ApiModelProperty(value = "实付金额")
private BigDecimal actuallyPayPrice;
- @ApiModelProperty(value = "退款价格")
+ @ApiModelProperty(value = "退款金额")
private BigDecimal refundPrice;
@ApiModelProperty(value = "退款状态")
@@ -123,7 +127,7 @@
@ApiModelProperty(value = "退款渠道")
private String channel;
- @ApiModelProperty(value = "退款原因")
+ @ApiModelProperty(value = "退货类型")
private String reason;
@ApiModelProperty(value = "备注")
--
Gitblit v1.9.3