Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

mg

2022-10-17 edade5a0933d5abf784e8a86785bb5d0b9c5a8ac

 ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnSetController.java

@@ -42,7 +42,7 @@
    @ApiOperation("获取指定栏目")
    @RequestMapping(value = "/getColumnSet/{id}", method = RequestMethod.GET)
    @ResponseBody
    public CommonResult<MessageColumnSet> getMessage(@PathVariable Long id) {
    public CommonResult<MessageColumnSet> getColumnSet(@PathVariable Long id) {
        MessageColumnSet columnSet = iMessageColumnSetService.getById(id);
        return CommonResult.success(columnSet);
    }