From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponRecordServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponRecordServiceImpl.java
index f6637fb..c2c28c5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponRecordServiceImpl.java
@@ -28,7 +28,7 @@
 	}
 
 	@Override
-	public int insertSelective(PushCouponRecord record) {
+	public int insertSelective(PushCouponRecord record) throws Exception{
 		return pushCouponRecordMapper.insertSelective(record);
 	}
 

--
Gitblit v1.8.0