From 659ecb86b75e24c95ab2edc9a056fdd6f7d90a91 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 23 八月 2019 11:09:28 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/dto/dataoke/DingDongQiangDTO.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/dataoke/DingDongQiangDTO.java b/fanli/src/main/java/com/yeshi/fanli/dto/dataoke/DingDongQiangDTO.java
index a6e9af0..d2a6056 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/dataoke/DingDongQiangDTO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/dataoke/DingDongQiangDTO.java
@@ -2,7 +2,7 @@
import java.util.List;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
/**
* 澶ф窐瀹㈠彯鍜氭姠
@@ -12,9 +12,9 @@
*/
public class DingDongQiangDTO {
private String time;
- private List<DaTaoKeDetail> goodsList;
+ private List<DaTaoKeDetailV2> goodsList;
- public DingDongQiangDTO(String time, List<DaTaoKeDetail> goodsList) {
+ public DingDongQiangDTO(String time, List<DaTaoKeDetailV2> goodsList) {
this.time = time;
this.goodsList = goodsList;
}
@@ -30,11 +30,11 @@
this.time = time;
}
- public List<DaTaoKeDetail> getGoodsList() {
+ public List<DaTaoKeDetailV2> getGoodsList() {
return goodsList;
}
- public void setGoodsList(List<DaTaoKeDetail> goodsList) {
+ public void setGoodsList(List<DaTaoKeDetailV2> goodsList) {
this.goodsList = goodsList;
}
}
--
Gitblit v1.8.0