From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:26:57 +0800
Subject: [PATCH] 冲突信息

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralDetailService.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralDetailService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralDetailService.java
index cd08800..a08e536 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralDetailService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/integral/IntegralDetailService.java
@@ -48,4 +48,5 @@
 	 */
 	public BigDecimal getCumulativeMoney(Long uid);
 
+
 }

--
Gitblit v1.8.0