From 408bab8b1c0c10514b8395cff92e47751e4dcdcd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 07 三月 2026 11:28:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
index c2004c3..821347d 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -61,6 +62,15 @@
     @ApiModelProperty("澶囨敞")
     private String remark;
 
+    @ApiModelProperty("'鏁村崟鎶樻墸棰�'")
+    private BigDecimal totalDiscountAmount;
+
+    @ApiModelProperty("'鏁村崟鎶樻墸鐜�'")
+    private BigDecimal totalDiscountRate;
+
+    @ApiModelProperty("'鎴愪氦閲戦'")
+    private BigDecimal totalAmount;
+
     @ApiModelProperty("褰曞叆鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;

--
Gitblit v1.9.3