From 6461fd7ef5ff8a2b3239b0c9bccd936ab15732ab Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 17:53:14 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
index 5537061..4efccf5 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
@@ -51,6 +51,10 @@
     @TableField("end_time")
     private LocalDateTime endTime;
 
+    @ApiModelProperty(value = "核销人id")
+    @TableField("canceller_app_user_id")
+    private Long cancellerAppUserId;
+
     @ApiModelProperty(value = "售后截止日期")
     @TableField("after_sale_time")
     private LocalDateTime afterSaleTime;
@@ -95,6 +99,10 @@
     @TableField("good_amount")
     private BigDecimal goodAmount;
 
+    @ApiModelProperty(value = "用户优惠券id")
+    @TableField("user_coupon_id")
+    private Long userCouponId;
+
     @ApiModelProperty(value = "活动优惠金额")
     @TableField("activity_amount")
     private BigDecimal activityAmount;
@@ -135,6 +143,10 @@
     @TableField("express_json")
     private String expressJson;
 
+    @ApiModelProperty(value = "第三方快递结果")
+    @TableField("express_result")
+    private String expressResult;
+
     @ApiModelProperty(value = "收货地址信息")
     @TableField("address_json")
     private String addressJson;

--
Gitblit v1.7.1