Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-09 3ed7fcd25a5233a8fc1a00e5602e89e92ebe82ae

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderVO.java

@@ -10,7 +10,7 @@
@Data
public class OrderVO {
    @ApiModelProperty(value = "订单id")
    private Long id;
    private String id;

    @ApiModelProperty(value = "订单编号")
    private String orderNumber;