Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

CeDo

2021-06-05 dc66d99f3d8172335cabc85297ae370c15e72b32

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java

@@ -123,9 +123,10 @@
    @ApiOperation(value = "处理事件", response = R.class)
    R deal(@Validated @RequestBody CommonEventDealDTO commonEventDealDTO){
        ClazzUtils.setIfStringIsEmpty(commonEventDealDTO);
        LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        commonEventDealDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventDealDTO.setUserName(loginUserInfoVO.getName());
        commonEventDealDTO.setOperateType(0);
        return gridService.dealEvent(commonEventDealDTO);
    }