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

mitao

2025-03-11 396b0760eeee4f37a21cc708955cda45ca746aa5

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

@@ -30,7 +30,7 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private LocalDateTime orderTime;

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