From f4d4486e55b91ab2d6313c48dbe8500c3928e8fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 09:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dto/order/dividents/UserDividentsDayDTO.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/order/dividents/UserDividentsDayDTO.java b/fanli/src/main/java/com/yeshi/fanli/dto/order/dividents/UserDividentsDayDTO.java
index 99abdfc..375acad 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/order/dividents/UserDividentsDayDTO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/order/dividents/UserDividentsDayDTO.java
@@ -1,13 +1,15 @@
 package com.yeshi.fanli.dto.order.dividents;
 
+import java.util.Date;
+
 public class UserDividentsDayDTO {
 	private Long uid;
-	private String day;
+	private Date preGetTime;
 
-	public UserDividentsDayDTO(Long uid, String day) {
+	public UserDividentsDayDTO(Long uid, Date preGetTime) {
 		super();
 		this.uid = uid;
-		this.day = day;
+		this.preGetTime = preGetTime;
 	}
 
 	public Long getUid() {
@@ -18,12 +20,12 @@
 		this.uid = uid;
 	}
 
-	public String getDay() {
-		return day;
+	public Date getPreGetTime() {
+		return preGetTime;
 	}
 
-	public void setDay(String day) {
-		this.day = day;
+	public void setPreGetTime(Date preGetTime) {
+		this.preGetTime = preGetTime;
 	}
 
 }

--
Gitblit v1.8.0