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

xin

2025-07-16 6269dc7a50d5028fa616b339cfe790b6e0d5d16e

 oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java

@@ -96,6 +96,9 @@
    @ApiModelProperty(value = "配送费详情Id")
    private String deliveryFeeId;

    @ApiModelProperty(value = "预计送达时间")
    private String orderTime;

    public void copy(RiderOrderRecord source){
        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
    }