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/inter/push/PushCouponRecordService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushCouponRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushCouponRecordService.java
index 2b6ee12..c80903a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushCouponRecordService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushCouponRecordService.java
@@ -10,7 +10,7 @@
 
 	public int insert(PushCouponRecord record);
 
-	public int insertSelective(PushCouponRecord record);
+	public int insertSelective(PushCouponRecord record) throws Exception;
 
 	public PushCouponRecord selectByPrimaryKey(Long id);
 

--
Gitblit v1.8.0