Merge remote-tracking branch 'origin/master'

rentaiming

2024-06-22 98933984fa1353d298a5117fb2a2d044fc51af93

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

@@ -149,7 +149,7 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private LocalDateTime purchase;

    @ApiModelProperty(value = "是否售后")
    @ApiModelProperty(value = "是否售后 1否，2 是")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer isRequest;

@@ -165,4 +165,13 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer isAuctionBond;

    @ApiModelProperty(value = "售后订单")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long requestId;

    @ApiModelProperty("发货快递")
    private String logisticsNum;



}