From 706d0d62cc25829ec6948e2fd5d03e62acf29306 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 11 三月 2026 11:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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..3de6e3d 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
@@ -6,7 +6,11 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -47,7 +51,8 @@
private Integer projectPhase;
@ApiModelProperty("鍒跺崟鏃ユ湡")
- private LocalDateTime preparedAt;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate preparedAt;
@ApiModelProperty("鍒跺崟浜篿d")
private Long preparedUserId;
@@ -61,6 +66,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