Merge branch 'pxb' into xin

xin

2025-09-04 ea26c842829ef69be20ef86d6a546f45c6c5a258

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

@@ -25,7 +25,7 @@
    @ApiModelProperty(value = "订单号")
    private String orderNum;

    @ApiModelProperty(value = "骑手操作类型 1-上报到店 2-上报已取商品")
    @ApiModelProperty(value = "骑手操作类型 1-上报到店 2-取货配送")
    private String operationType;

}