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/ProfitSharing.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/ProfitSharing.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/ProfitSharing.java
index ad038c8..f45be82 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/ProfitSharing.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/ProfitSharing.java
@@ -40,7 +40,7 @@
private Integer delFlag;
/**
* 1：PROCESSING：处理中
-2：FINISHED：分账完成
+ 2：FINISHED：分账完成
*/
@TableField("share_status")
private Integer shareStatus;
@@ -93,7 +93,15 @@
* 完成时间
*/
@TableField("finish_time")
- private Date finishTime;
+ private String finishTime;
+
+ /**
+ * 微信分账/回退单号
+ */
+ @TableField("wx_order_id")
+ private String wxOrderId;
+
+
/**
* 分账失败原因
1、ACCOUNT_ABNORMAL : 分账接收账户异常
--
Gitblit v1.7.1