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/BlackListVo.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/BlackListVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/BlackListVo.java
new file mode 100644
index 0000000..5b5ee26
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/BlackListVo.java
@@ -0,0 +1,24 @@
+package com.xcong.excoin.modules.otc.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "BlackListVo", description = "黑名单列表接口返回类")
+public class BlackListVo {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "昵称")
+ private String name;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "拉黑时间")
+ private Date time;
+}
--
Gitblit v1.9.1