Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-17 bc3622df57b5c28187485e44a4062ced04f13174

Merge branch 'local_20221104' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComPropertyApi.java

@@ -55,11 +55,11 @@
        return userService.addFeedback(sysUserFeedbackDTO);
    }

    @ApiOperation("查看自己的投诉建议或问题留言记录")
/*    @ApiOperation("查看自己的投诉建议或问题留言记录")
    @GetMapping("myFeedBack")
    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){
        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
    }
    }*/

    @ApiOperation(value = "通知公告列表",response = ComPropertyVO.class)
    @GetMapping("notice")

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java

@@ -86,5 +86,17 @@
        return R.ok();
    }

    @ApiOperation("新增投诉建议或问题留言")
    @PostMapping("addFeedBack")
    public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
        return userService.addFeedback(sysUserFeedbackDTO);
    }

/*    @ApiOperation("查看自己的投诉建议或问题留言记录")
    @GetMapping("myFeedBack")
    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){
        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
    }*/


}