From 3caa0b05a620aa7714de0d63c804e43aa6486c9b Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 11 Jul 2025 18:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin

---
 oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturnReason.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturnReason.java b/oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturnReason.java
index 7171bce..0b8f3e6 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturnReason.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturnReason.java
@@ -35,7 +35,7 @@
 
     @NotBlank
     @ApiModelProperty(value = "状态:0->不启用;1->启用")
-    private String reasonStatus;
+    private Boolean reasonStatus = false;
 
     public void copy(OrderReturnReason source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

--
Gitblit v1.9.3