Merge remote-tracking branch 'origin/master'

mitao

2024-06-18 f81ae4085304f74db4454e9168af75d59496bb87

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

@@ -69,4 +69,13 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private ReturnRequestStatusEnum status;

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

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


}