Merge remote-tracking branch 'origin/master'

mitao

2024-07-15 82de609c0b76d37d1a5044a631ddc1577374cdfa

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

@@ -169,4 +169,17 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long requestId;

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


    @ApiModelProperty(value = "订单说明")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String orderShuoMin;

    @ApiModelProperty(value = "订单退货周期")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer orderZq;


}