Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1

mitao

2025-02-14 e097b03e9032a8e884c36e6a28d8b5002780daeb

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java

@@ -50,7 +50,7 @@
    private OrderStatusEnum orderStatus;


    @ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单")
    @ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单 5=心愿求购")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private OrderFromEnum orderFrom;