From ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:55:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java
index 96dbdf3..2195a5e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ScanHistoryV2Service.java
@@ -55,7 +55,7 @@
 	 * @param uid
 	 * @param device
 	 */
-	public void deleteByDeviceOrUid(Long uid, String device, Integer goodsType);
+	public void deleteByDeviceOrUid(Long uid, String device);
 
 	/**
 	 * 鏍规嵁鐢ㄦ埛鎴栬�呰澶囧拰娣樺疂鍟嗗搧ID鍒犻櫎娴忚璁板綍

--
Gitblit v1.8.0