Merge branch 'pxb' into xin

xin

yesterday d3563f0bdb487124d79cdd20d0f8bfc79db31f24

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

@@ -65,6 +65,7 @@
    @ApiModelProperty(value = "用户id")
    private Long userId;

    public static final String COL_ORDER_NUM = "order_num";

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