From 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 07 Aug 2025 15:57:07 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnQueryCriteria.java | 11 ++++++++++-
1 files changed, 10 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 cd54935..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,15 +18,24 @@
@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;
--
Gitblit v1.9.3