From ae21df72cd3acbc8eb2ec4b9e55529ca9d02498c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Jul 2021 10:11:04 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-user/src/main/java/com/xzx/gc/user/service/UserService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java b/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
index 4a13f5f..b783a35 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
@@ -863,7 +863,7 @@
             map.put("money", DoubleUtil.roundTwo(String.valueOf(map.get("money"))));
             map.put("score", DoubleUtil.roundTwo(String.valueOf(map.get("score"))));
             map.put("weight", DoubleUtil.roundThree(String.valueOf(map.get("weight"))));
-            map.put("name", String.valueOf((ObjectUtil.isEmpty(map.get("name"))?"-":m.get("name"))));
+            map.put("name", String.valueOf((ObjectUtil.isEmpty(map.get("name"))?"-":map.get("name"))));
             map.put("createtime", String.valueOf(map.get("createTime")));
 
             String type = String.valueOf(map.get("type"));

--
Gitblit v1.9.1