From c642ca1d5aad271b22155fce6bd553533343501c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 24 七月 2025 09:10:10 +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 | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 7f472e7..7d88dae 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
@@ -153,6 +153,11 @@
@TableField("cancel_time")
private Date cancelTime;
/**
+ * 取消方（1=平台，2=商户，3=用户）
+ */
+ @TableField("cancel_type")
+ private Integer cancelType;
+ /**
* 核销用户id
*/
@TableField("use_user_id")
@@ -195,21 +200,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