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

huliguo

昨天 a966dafb8877552267a94fe8c544c5ea72cf5650

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
package com.ruoyi.order.domain.dto;
 
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; /**
 * @author zhibing.pu
 * @Date 2025/6/5 17:53
 */
@Data
@ApiModel
public class CancelMerOrderDto {
    @ApiModelProperty("商户id")
    private Long shopId;
    @ApiModelProperty("订单id")
    private String orderId;
}