From 617312cbc114c6ac38c8eb4a8bcda583c33dd72f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 31 七月 2019 11:58:57 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PDDCommonTemplateContentServiceImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PDDCommonTemplateContentServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PDDCommonTemplateContentServiceImpl.java
index 1c432e2..bbd5575 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PDDCommonTemplateContentServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PDDCommonTemplateContentServiceImpl.java
@@ -28,6 +28,7 @@
 			pddfilter.setPage(page);
 			pddfilter.setPageSize(pageSize);
 			pddfilter.setSortType(22);
+			pddfilter.setHasCoupon(false);
 			if ("-1".equalsIgnoreCase(cid)) {
 				pddfilter.setOptId(-1L);
 			} else {

--
Gitblit v1.8.0