From e577147005f0e78e7be9333766032405107b6a26 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 May 2021 10:53:45 +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/ApplyConditionsVo.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/ApplyConditionsVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/ApplyConditionsVo.java
index 359e4d1..a554624 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/vo/ApplyConditionsVo.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/ApplyConditionsVo.java
@@ -11,15 +11,27 @@
 public class ApplyConditionsVo {
 
     @ApiModelProperty(value = "商家入驻总单数1:满足 2:不满足")
-    private Integer orderNum;
+    private Integer orderNumStatus;
 
     @ApiModelProperty(value = "商家入驻完成率1:满足 2:不满足")
-    private Integer completionRate;
+    private Integer completionRateStatus;
 
     @ApiModelProperty(value = "商家入驻总金额1:满足 2:不满足")
-    private Integer totalAmount;
+    private Integer totalAmountStatus;
 
     @ApiModelProperty(value = "实名认证1:满足 2:不满足")
-    private Integer memberAuth;
+    private Integer memberAuthStatus;
+
+    @ApiModelProperty(value = "总单数")
+    private Integer orderNum;
+
+    @ApiModelProperty(value = "完成率")
+    private BigDecimal completionRate;
+
+    @ApiModelProperty(value = "总金额")
+    private BigDecimal totalAmount;
+
+    @ApiModelProperty(value = "今日取消次数")
+    private Integer cancellNum;
 
 }

--
Gitblit v1.9.1