From ecf9f0669734d4397aa1277f9a22f515aa410062 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 20 六月 2019 17:04:11 +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