From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 14:22:09 +0800
Subject: [PATCH] conflect merge

---
 src/main/java/com/xcong/excoin/modules/otc/vo/ApplyConditionsVo.java |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 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
new file mode 100644
index 0000000..a554624
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/ApplyConditionsVo.java
@@ -0,0 +1,37 @@
+package com.xcong.excoin.modules.otc.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "ApplyConditionsVo", description = "接口返回类")
+public class ApplyConditionsVo {
+
+    @ApiModelProperty(value = "商家入驻总单数1:满足 2:不满足")
+    private Integer orderNumStatus;
+
+    @ApiModelProperty(value = "商家入驻完成率1:满足 2:不满足")
+    private Integer completionRateStatus;
+
+    @ApiModelProperty(value = "商家入驻总金额1:满足 2:不满足")
+    private Integer totalAmountStatus;
+
+    @ApiModelProperty(value = "实名认证1:满足 2:不满足")
+    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