From 46f7c2ef3abc235e44c59be9b3c5396befc64888 Mon Sep 17 00:00:00 2001 From: 彭雪彬 <1724387007@qq.com> Date: Tue, 15 Jul 2025 18:33:09 +0800 Subject: [PATCH] Merge branch 'xin' into pxb --- oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnReasonQueryCriteria.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnReasonQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnReasonQueryCriteria.java index 2c43b09..9e9254d 100644 --- a/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnReasonQueryCriteria.java +++ b/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; } -- Gitblit v1.9.3