From b919b454bccc18d67b7109a09357499d09211eac Mon Sep 17 00:00:00 2001 From: 彭雪彬 <1724387007@qq.com> Date: Thu, 17 Jul 2025 18:07:08 +0800 Subject: [PATCH] Merge branch 'xin' into pxb --- oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnQueryCriteria.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnQueryCriteria.java index 4b98305..66f2261 100644 --- a/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnQueryCriteria.java +++ b/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnQueryCriteria.java @@ -18,18 +18,30 @@ @ApiModelProperty(value = "每页数据量", example = "10") private Integer size = 10; + @ApiModelProperty(value = "偏移量", hidden = true) + private long offset; + + @ApiModelProperty(value = "商品模糊查询") + private String blurry; + @ApiModelProperty(value = "退单号") private String returnNum; @ApiModelProperty(value = "订单状态") - private Integer returnStatus; + private List<Integer> returnStatus; @ApiModelProperty(value = "订单号") private String orderNum; + @ApiModelProperty(value = "支付类型") + private String payType; + @ApiModelProperty(value = "用户") private Long userId; + @ApiModelProperty(value = "用户账号") + private String username; + @ApiModelProperty(value = "门店ID") private Long storeId; -- Gitblit v1.9.3