From dcd5d07d5d648b48f6f04cd79b6e8c5b780dcff7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 16:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherCouponContentDTOFactory.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherCouponContentDTOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherCouponContentDTOFactory.java
index db43513..a4226ad 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherCouponContentDTOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherCouponContentDTOFactory.java
@@ -40,7 +40,7 @@
}
public static MsgOtherCouponContentDTO createWelfareCouponUsed(Integer leftDay, Date startTime, Date endTime) {
- MsgOtherCouponContentDTO dto = getGeneral(leftDay, "鎴愬姛閭�璇�1涓槦鍛�", startTime, endTime);
+ MsgOtherCouponContentDTO dto = getGeneral(null, "鎴愬姛閭�璇�1涓槦鍛�", startTime, endTime);
dto.setState("宸茶浣跨敤");
return dto;
}
@@ -82,7 +82,7 @@
public static MsgOtherCouponContentDTO createCouponUsed(Integer leftDay, String source, Date startTime,
Date endTime) {
- MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
+ MsgOtherCouponContentDTO dto = getGeneral(null, source, startTime, endTime);
dto.setState("宸茶浣跨敤");
return dto;
}
@@ -118,7 +118,7 @@
public static MsgOtherCouponContentDTO createRewardCouponUsed(Integer leftDay, String source, Date startTime,
Date endTime) {
- MsgOtherCouponContentDTO dto = getGeneral(leftDay, source, startTime, endTime);
+ MsgOtherCouponContentDTO dto = getGeneral(null, source, startTime, endTime);
dto.setState("宸茶浣跨敤");
return dto;
}
--
Gitblit v1.8.0