Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-06-05 62ef4ba5d19e489e8cb0a87f0e95fbb945dd7fde

 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);
    }