From f53edec193227af90aad11f557723e72b4860400 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 03 一月 2019 18:18:21 +0800
Subject: [PATCH] 冲突处理
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
index f50b971..b14d048 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
@@ -1430,8 +1430,7 @@
if (commision == null) {
commision = 0;
}
- map.put("commision", commision + "骞�");
-
+ map.put("commision", commision);
listObject.add(map);
}
--
Gitblit v1.8.0