From f10a7c29f1a3748b28d2809335625c7888473b26 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 22 九月 2025 22:21:19 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtThirdOrderPageVo.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtThirdOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtThirdOrderPageVo.java
index f5ca6a3..a13a48d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtThirdOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtThirdOrderPageVo.java
@@ -16,6 +16,10 @@
     @ApiModelProperty(value="订单编号")
     private String orderNo;
 
+    @Excel(name = "第三方订单号", width = 30, sort = 1)
+    @ApiModelProperty(value="第三方订单号")
+    private String tripartiteOrderId;
+
     @Excel(name = "订单来源", width = 30, sort = 1)
     @ApiModelProperty(value="订单来源")
     private String orderFrom;

--
Gitblit v1.7.1