From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PublicityEventApi.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PublicityEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PublicityEventApi.java
index 813e55a..5b5721b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PublicityEventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PublicityEventApi.java
@@ -60,7 +60,7 @@
         ClazzUtils.setIfStringIsEmpty(publicityEventAddDTO);
         LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
         publicityEventAddDTO.setUserId(loginUserInfoVO.getUserId());
-        publicityEventAddDTO.setUserName(loginUserInfoVO.getName());
+        publicityEventAddDTO.setUserName(loginUserInfoVO.getNickName());
         publicityEventAddDTO.setPhone(loginUserInfoVO.getPhone());
         return gridService.addPublicity(publicityEventAddDTO);
     }
@@ -76,7 +76,7 @@
         ClazzUtils.setIfStringIsEmpty(publicityEventEditDTO);
         LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
         publicityEventEditDTO.setUserId(loginUserInfoVO.getUserId());
-        publicityEventEditDTO.setUserName(loginUserInfoVO.getName());
+        publicityEventEditDTO.setUserName(loginUserInfoVO.getNickName());
         publicityEventEditDTO.setPhone(loginUserInfoVO.getPhone());
         return gridService.savePublicityDraft(publicityEventEditDTO);
     }

--
Gitblit v1.7.1