Merge branch 'xin' into pxb

彭雪彬

2025-07-15 a7501803a3ca43310e57a5dd912e5047919c2e43

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

@@ -21,8 +21,8 @@
    @ApiModelProperty(value = "退货类型")
    private String reasonName;

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

    private List<Timestamp> createTime;
}