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

huanghongfa

2021-06-07 cc40228f8cc2f36329f7d92fcab8c8130dc39810

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

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java

@@ -50,9 +50,9 @@
     * @param pageEventManageDTO 查找事件
     * @return 查找结果
     */
    @GetMapping("/usersList")
    @PostMapping("/usersList")
    @ApiOperation(value = "事件列表", response= EventVO.class)
    R usersList(@Validated @ModelAttribute PageEventManageDTO pageEventManageDTO){
    R usersList(@Validated @RequestBody PageEventManageDTO pageEventManageDTO){
        ClazzUtils.setIfStringIsEmpty(pageEventManageDTO);
        if(!isCommonType(pageEventManageDTO.getEventType())){
            return R.fail(400, "事件类型错误");