From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/util/ShamHongBaoUtil.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/ShamHongBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/ShamHongBaoUtil.java
index 6fb856a..1ece662 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/ShamHongBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/ShamHongBaoUtil.java
@@ -56,7 +56,7 @@
if (cell.getContents() == null || "".equals(cell.getContents().trim())) {
continue;
}
- shamUserService.delete(Long.parseLong(cell.getContents()));
+ shamUserService.deleteByPrimaryKey(Long.parseLong(cell.getContents()));
}
} catch (BiffException e) {
e.printStackTrace();
--
Gitblit v1.8.0