From 73699775f5546177ce71e3bae33d83a8aa346793 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Mon, 25 May 2020 11:28:10 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git

---
 src/main/java/com/xcong/excoin/modules/home/dto/MemberQuickBuySaleDto.java |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/home/dto/MemberQuickBuySaleDto.java b/src/main/java/com/xcong/excoin/modules/home/dto/MemberQuickBuySaleDto.java
index cfb5506..e927ee2 100644
--- a/src/main/java/com/xcong/excoin/modules/home/dto/MemberQuickBuySaleDto.java
+++ b/src/main/java/com/xcong/excoin/modules/home/dto/MemberQuickBuySaleDto.java
@@ -1,6 +1,7 @@
 package com.xcong.excoin.modules.home.dto;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 import javax.validation.constraints.NotNull;
 
@@ -24,22 +25,17 @@
 	@ApiModelProperty(value = "金额(USDT)",example = "100")
     private BigDecimal amountUsdt;
 	
-	@ApiModelProperty(value = "付款方式 1-支付宝2-微信3-银行卡",example = "1")
-    private int paymentType;
-	
-	@ApiModelProperty(value = "收款账号",example = "13000000000")
-    private String paymentAccount;
-	
-	@ApiModelProperty(value = "收款人姓名",example = "张三")
-    private String paymentName;
-	
 	@ApiModelProperty(value = "单价",example = "7")
     private BigDecimal unitPrice;
-	
-	@ApiModelProperty(value = "订单状态 1-新建2-已付款3-已审核4-撤单5-系统取消",example = "1")
-    private int orderStatus;
 	
 	@NotNull(message = "订单类型不能为空")
 	@ApiModelProperty(value = "订单类型 B买入 S卖出",example = "B")
     private String orderType;
+	
+	@NotNull(message = "交易密码不能为空")
+	@ApiModelProperty(value = "交易密码",example = "123456")
+	private String tradePassword;
+	
+	@ApiModelProperty(value = "充值时间")
+	private Date ChargeTime;
 }

--
Gitblit v1.9.1