Merge branch 'pxb' into xin

xin

2 days ago d3563f0bdb487124d79cdd20d0f8bfc79db31f24

 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;

}