From a8e45a802600ca1cde28fe8522a26635328bbd99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 17:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java
index 47db509..0502c81 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java
@@ -6,8 +6,8 @@
 
 import org.apache.ibatis.annotations.Param;
 
+import com.yeshi.fanli.dto.HongBao;
 import com.yeshi.fanli.dto.HongBaoDTO;
-import com.yeshi.fanli.entity.bus.user.HongBao;
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.order.CommonOrder;
 import com.yeshi.fanli.exception.HongBaoException;
@@ -37,12 +37,6 @@
 	 */
 	public void addHongBao(List<CommonOrder> commonOrder, int type) throws HongBaoException;
 
-	/**
-	 * 灏嗚�佺増鏈殑绾㈠寘瀵硅薄杞负鏂扮増鏈殑瀵硅薄
-	 * 
-	 * @param hb
-	 */
-	public void convert(HongBao hb);
 
 	/**
 	 * 濂栭噾鍒楄〃锛�1.4.9涔嬪墠鐨勭増鏈級

--
Gitblit v1.8.0