From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgOrderDetailService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgOrderDetailService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgOrderDetailService.java
index 6ce5952..d7859f3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgOrderDetailService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgOrderDetailService.java
@@ -18,9 +18,10 @@
 	 * 鏍规嵁璁㈠崟鍙风敤鎴稩D鏇存柊鏁版嵁
 	 * 
 	 * @param detail
+	 * @param needNotify-鏄惁闇�瑕侀�氱煡
 	 * @throws MsgOrderDetailException
 	 */
-	public void updateMsgOrderDetail(MsgOrderDetail detail) throws MsgOrderDetailException;
+	public void updateMsgOrderDetail(MsgOrderDetail detail,boolean needNotify) throws MsgOrderDetailException;
 
 	/**
 	 * 璁㈠崟娑堟伅鍒楄〃

--
Gitblit v1.8.0