Merge remote-tracking branch 'origin/master' into xin

xin

2025-07-14 b4d3224898d50b8f1e30b5c8083a520743927282

 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));