From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 10:31:30 +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/pojo/order/Order.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
index fda482f..13dd518 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java
@@ -56,7 +56,7 @@
private String outTradeNo;
/**
- * 订单来源1.商城2.秒杀活动3.线下创建
+ * 订单来源1.商城2.秒杀活动3.线下创建4.抽奖
*/
@TableField("order_from")
private Integer orderFrom;
@@ -195,21 +195,26 @@
*/
@TableField("new_member_flag")
private Integer newMemberFlag;
-
+
/**
- * @description 未绑定标记
- * @author jqs
- * @date 2023/9/8 10:45
+ * @description 未绑定标记
+ * @author jqs
+ * @date 2023/9/8 10:45
* @param null
- * @return null
+ * @return null
*/
@TableField("unbinding_flag")
private Integer unbindingFlag;
-
-
+ /**
+ * 三方平台订单id
+ */
+ @TableField("tripartite_order_id")
+ private String tripartiteOrderId;
+
+
@Override
protected Serializable pkVal() {
return this.orderId;
}
-
+
}
--
Gitblit v1.7.1