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/dto/AddBlackDto.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/otc/dto/AddBlackDto.java b/src/main/java/com/xcong/excoin/modules/otc/dto/AddBlackDto.java
new file mode 100644
index 0000000..7b568e2
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/dto/AddBlackDto.java
@@ -0,0 +1,25 @@
+package com.xcong.excoin.modules.otc.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+
+@Data
+@ApiModel(value = "AddBlackDto", description = "拉黑/取消拉黑接口参数接受类")
+public class AddBlackDto {
+
+    @NotNull(message = "参数错误")
+    @ApiModelProperty(value = "订单id/黑名单id")
+    private Long id;
+
+    @NotBlank(message = "参数错误")
+    @ApiModelProperty(value = "1-订单 2-黑名单ID")
+    private Integer type;
+
+    @ApiModelProperty(value = "原因 - 删除不传")
+    private String reason;
+}

--
Gitblit v1.9.1