Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-06 9641ecf8686475aa13d8520ccdde4611b5457541

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java

@@ -14,6 +14,9 @@
    @ApiModelProperty(value = "订单id")
    private Long id;

    @ApiModelProperty(value = "订单状态")
    private Integer orderStatus;

    @ApiModelProperty(value = "订单商品")
    private List<OrderGoodsVO> goodsList;