Merge branch 'master' into xin

xin

5 days ago 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179

 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));