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/OrderListVo.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/OrderListVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/OrderListVo.java
new file mode 100644
index 0000000..43a791a
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/OrderListVo.java
@@ -0,0 +1,43 @@
+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.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "OtcOrderListVo", description = "订单列表返回参数类")
+public class OrderListVo {
+
+ @ApiModelProperty(value = "订单ID")
+ private Long id;
+
+ @ApiModelProperty(value = "订单编号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "单价")
+ private BigDecimal unitPrice;
+
+ @ApiModelProperty(value = "usdt数量")
+ private BigDecimal amount;
+
+ @ApiModelProperty(value = "总金额")
+ private BigDecimal totalAmount;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "时间")
+ private Date createTime;
+
+ @ApiModelProperty(value = "状态 1-已提交 2-已付款 3-已完成 4-已取消")
+ private Integer status;
+
+ @ApiModelProperty(value = "订单类型 B-买/S-卖")
+ private String orderType;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+}
--
Gitblit v1.9.1