Merge branch 'refs/heads/master' into xin

xin

2025-09-17 6d31d535d737ed26c4d9d61cd4e0b5483cb9b0ba

 oying-system/src/main/java/com/oying/modules/sh/domain/request/ReturnOrder.java

@@ -27,6 +27,7 @@
    private String remark;
    @ApiModelProperty(value = "图片地址，多张','分割")
    private String photos;
    List<ProductOrder>  productOrders;
    @ApiModelProperty(value = "订单商品")
    private List<ProductOrder>  productOrders;

}