Merge remote-tracking branch 'origin/master'

mitao

2024-06-19 d4f159d60acf6f263bfa4508a113c0feacd2f5b9

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

@@ -71,6 +71,9 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String courierNumber;

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

    @ApiModelProperty("退货时间")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private LocalDateTime returnTime;