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

diff --git a/src/main/java/com/xcong/excoin/modules/otc/dto/HasPayDto.java b/src/main/java/com/xcong/excoin/modules/otc/dto/HasPayDto.java
new file mode 100644
index 0000000..81651d7
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/dto/HasPayDto.java
@@ -0,0 +1,16 @@
+package com.xcong.excoin.modules.otc.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "HasPayDto", description = "已付款接口接收参数类")
+public class HasPayDto {
+
+    @ApiModelProperty(value = "订单ID", example = "1")
+    private Long id;
+
+    @ApiModelProperty(value = "姓名", example = "张三")
+    private String name;
+}

--
Gitblit v1.9.1