From 1837720b1fcc164e594df34f8590a594dfa2a8e0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:35:14 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOtherDetailServiceImpl.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOtherDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOtherDetailServiceImpl.java
index a81c05d..26fddc0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOtherDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOtherDetailServiceImpl.java
@@ -27,7 +27,6 @@
@Override
public void addMsgOtherDetail(MsgOtherDetail detail) throws MsgOtherDetailException {
-
if (detail.getType() == MsgTypeOtherTypeEnum.couponMianDan
|| detail.getType() == MsgTypeOtherTypeEnum.couponReward
|| detail.getType() == MsgTypeOtherTypeEnum.couponWelfareMianDan) {
--
Gitblit v1.8.0