From 99faf7be593f0595ce435084ee2b90a8d3da3bd4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 May 2021 15:58:31 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc
---
src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java
index 46b96e6..33b0fdb 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java
@@ -38,16 +38,23 @@
@ApiModelProperty(value = "银行卡姓名")
private String cardName;
+ @ApiModelProperty(value = "支付方式 1-微信 2-支付宝 3-银行卡")
+ private String payType;
+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "支付时间")
private Date payTime;
-
@ApiModelProperty(value = "姓名")
private String payName;
@ApiModelProperty(value = "商家昵称")
private String saleName;
+
+ @ApiModelProperty(value = "商家MemberId")
+ private Long saleMemberId;
+ @ApiModelProperty(value = "memberId")
+ private Long memberId;
@ApiModelProperty(value = "商家ID")
private Long mbId;
@@ -66,4 +73,10 @@
@ApiModelProperty(value = "剩余秒数")
private Long times;
+
+ @ApiModelProperty(value = "是否已拉黑 1-是 2-否")
+ private Integer isBlack;
+
+ @ApiModelProperty(value = "是否自己的委托单 1-是 2-否")
+ private Integer isOwnEntrust;
}
--
Gitblit v1.9.1