From 1e1516ebbb837821e0565d82db33f89259db46d1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 14 May 2021 20:30:56 +0800
Subject: [PATCH] 20210514 云顶
---
src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java b/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java
index 7ef2088..e681bda 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/entity/YdOrderEntity.java
@@ -66,6 +66,12 @@
private BigDecimal todayProfit;
/**
+ * 订单类型 1-矿机订单 2-代理订单
+ */
+
+ private Integer type;
+
+ /**
* 1：待生效 2：生效中 3：已终止
*/
@@ -78,21 +84,21 @@
* 购买日期
*/
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
private Date buyTime;
/**
* 生效日期
*/
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
private Date workTime;
/**
* 终止日期
*/
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
private Date endTime;
@TableField(exist = false)
@@ -106,6 +112,8 @@
private String name;
@TableField(exist = false)
private String proUnit;
+ @TableField(exist = false)
+ private BigDecimal salePrice;
--
Gitblit v1.9.1