Merge remote-tracking branch 'origin/master' into xin

xin

2025-07-11 3caa0b05a620aa7714de0d63c804e43aa6486c9b

 oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnReasonQueryCriteria.java

@@ -18,7 +18,11 @@
    @ApiModelProperty(value = "每页数据量", example = "10")
    private Integer size = 10;

    @ApiModelProperty(value = "状态：0->不启用；1->启用")
    private String reasonStatus;
    @ApiModelProperty(value = "退货类型")
    private String reasonName;

    @ApiModelProperty(value = "状态：false->停用；true->启用")
    private Boolean reasonStatus;

    private List<Timestamp> createTime;
}