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

huliguo

2025-07-25 c897a68da55d63439826d37be3cb13c5c0f95a48

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java

@@ -43,7 +43,7 @@
    private UserServiceRecordService userServiceRecordService;

    @RequestMapping(value = "/listMerConsumerGoods", method = RequestMethod.POST)
    @ApiOperation(value = "获取用户服务列表")
    @ApiOperation(value = "获取用户服务列表【2.0】")
    public R<MerConsumerGoodsVo> listMerConsumerGoods(@RequestBody MerConsumerGoodsDto merConsumerGoodsDto) {
        Long userId = SecurityUtils.getUserId();
        merConsumerGoodsDto.setUserId(userId);