From beeda8df0023376dbb2021148a021731dc4aedb0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 06 八月 2023 11:29:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderPayment.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderPayment.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderPayment.java
index 43415ca..93d22e0 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderPayment.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderPayment.java
@@ -42,12 +42,18 @@
* 用户id
*/
@TableField("user_id")
- private Integer userId;
+ private Long userId;
/**
* 商户id
*/
@TableField("shop_id")
- private Integer shopId;
+ private Long shopId;
+ /**
+ * 订单二级商户号
+ */
+ @TableField("sub_mch_id")
+ private String subMchId;
+
/**
* 订单id
*/
@@ -104,6 +110,8 @@
@TableField("back_time")
private Date backTime;
+ @TableField("transaction_id")
+ private String transactionId;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1