From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetailV2.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetailV2.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetailV2.java
index a5d4a6c..4e7ab55 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetailV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetailV2.java
@@ -1,16 +1,23 @@
package com.yeshi.fanli.entity.taobao.dataoke;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.index.Indexed;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.Field;
@Document(collection = "daTaoKeGoods")
-public class DaTaoKeDetailV2 {
+public class DaTaoKeDetailV2 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
@Id
private Long id;// 鍟嗗搧ID
+ @Indexed
@Field
private Long goodsId;// 娣樺疂鍟嗗搧ID
@Field
@@ -47,12 +54,13 @@
private BigDecimal couponPrice;// 浼樻儬鍒搁噾棰�
@Field
private String couponConditions;// 浼樻儬鍒镐娇鐢ㄦ潯浠�
+ @Deprecated
@Field
private String couponId;// 鍒窱D
@Field
private Integer activityType;// 娲诲姩绫诲瀷锛�1-鏃犳椿鍔紝2-娣樻姠璐紝3-鑱氬垝绠�
@Field
- private String createTime;// 鍟嗗搧鍒涘缓鏃堕棿
+ private Date createTime;// 鍟嗗搧鍒涘缓鏃堕棿
@Field
private String mainPic;// 鍟嗗搧涓诲浘閾炬帴
@Field
@@ -97,7 +105,7 @@
private Integer tbcid;// 鍟嗗搧鍦ㄦ窐瀹濈殑浜岀骇鍒嗙被id 锛岄潪澶ф窐瀹㈢殑浜岀骇鍒嗙被
@Field
private Date updateTime;
- //棰濆瀛楁缁存姢
+ // 棰濆瀛楁缁存姢
@Field
private Integer commission;// 浣ｉ噾閲戦锛屽崟浣嶄负鍒�
@@ -285,11 +293,11 @@
this.activityType = activityType;
}
- public String getCreateTime() {
+ public Date getCreateTime() {
return createTime;
}
- public void setCreateTime(String createTime) {
+ public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
--
Gitblit v1.8.0