Merge branch 'refs/heads/master' into xin

xin

2025-09-12 8849a8a7032079df128f0c530fd4368cfbc75d81

 oying-system/src/main/java/com/oying/modules/message/rest/MesShopReplyController.java

@@ -23,13 +23,13 @@
**/
@RestController
@RequiredArgsConstructor
@Api(tags = "消息")
//@Api(tags = "消息")
@RequestMapping("/api/mesShopReply")
public class MesShopReplyController {

    private final MesShopReplyService mesShopReplyService;

    @ApiOperation("导出数据")
//    @ApiOperation("导出数据")
    @GetMapping(value = "/download")
    @PreAuthorize("@el.check('mesShopReply:list')")
    public void exportMesShopReply(HttpServletResponse response, MesShopReplyQueryCriteria criteria) throws IOException {
@@ -37,7 +37,7 @@
    }

    @GetMapping
    @ApiOperation("查询消息")
//    @ApiOperation("查询消息")
    @PreAuthorize("@el.check('mesShopReply:list')")
    public ResponseEntity<PageResult<MesShopReply>> queryMesShopReply(MesShopReplyQueryCriteria criteria){
        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
@@ -45,8 +45,8 @@
    }

    @PostMapping
    @Log("新增消息")
    @ApiOperation("新增消息")
//    @Log("新增消息")
//    @ApiOperation("新增消息")
    @PreAuthorize("@el.check('mesShopReply:add')")
    public ResponseEntity<Object> createMesShopReply(@Validated @RequestBody MesShopReply resources){
        mesShopReplyService.create(resources);
@@ -54,8 +54,8 @@
    }

    @PutMapping
    @Log("修改消息")
    @ApiOperation("修改消息")
//    @Log("修改消息")
//    @ApiOperation("修改消息")
    @PreAuthorize("@el.check('mesShopReply:edit')")
    public ResponseEntity<Object> updateMesShopReply(@Validated @RequestBody MesShopReply resources){
        mesShopReplyService.update(resources);
@@ -63,8 +63,8 @@
    }

    @DeleteMapping
    @Log("删除消息")
    @ApiOperation("删除消息")
//    @Log("删除消息")
//    @ApiOperation("删除消息")
    @PreAuthorize("@el.check('mesShopReply:del')")
    public ResponseEntity<Object> deleteMesShopReply(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
        mesShopReplyService.deleteAll(ids);