From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandInfoRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandInfoRecordService.java
index dbea6de..0db18b0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandInfoRecordService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandInfoRecordService.java
@@ -38,6 +38,6 @@
 	 * @param uid
 	 * @param device
 	 */
-	public void deleteRecord(List<Long> list, Long uid, String device);
+	public void deleteRecord(List<String> list, Long uid, String device);
 	
 }

--
Gitblit v1.8.0