From ec74f248ddac773a6024a243a37346bd2e9bb028 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 15 Oct 2020 23:46:09 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin_agent
---
src/main/java/com/xcong/excoin/modules/contract/entity/AgentReturnEntity.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/entity/AgentReturnEntity.java b/src/main/java/com/xcong/excoin/modules/contract/entity/AgentReturnEntity.java
index ec79197..c57be1a 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/entity/AgentReturnEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/entity/AgentReturnEntity.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xcong.excoin.common.entity.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
/**
* @author wzy
@@ -63,8 +65,16 @@
private int closingType;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField(exist = false)
- private String returnInviteId;
+ private Date startTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date endTime;
+ @TableField(exist = false)
+ private String timeType;
+ @TableField(exist = false)
+ private String account;
@TableField(exist = false)
private String phone;
@TableField(exist = false)
--
Gitblit v1.9.1