From 8093bf217b5dbe59a5703b013f3fc79ed0d4fc36 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 一月 2025 18:06:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java |    4 ++++
 1 files changed, 4 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..6442849 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;

--
Gitblit v1.7.1