From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnReasonQueryCriteria.java | 4 ++--
1 files changed, 2 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 9f0ed5f..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
@@ -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;
}
--
Gitblit v1.9.3