From ad723be9b0bd0977619caf5ce31b91d04116c70e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 07 七月 2021 10:57:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 41bd4a4..7d298fd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1903,6 +1903,11 @@
         menuRoleVO.setRoleId(roleId);
         this.putMenuRole(menuRoleVO);
 
+        //关联市平台网格员
+//        if(eventGridMemberAddDTO.getLcMemberId() != null){
+//
+//        }
+
         //参数校验
         SysUserDO oldUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType,6)
                 .eq(SysUserDO::getNickName,eventGridMemberAddDTO.getNickName()));

--
Gitblit v1.7.1