Merge branch 'pxb' into xin

xin

4 days ago 044a57d2133b2363a6f0d3d167b3eaa587c70b91

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

@@ -99,6 +99,10 @@
    @ApiModelProperty(value = "预计送达时间")
    private String orderTime;

    @ApiModelProperty(value = "用户手机号")
    private String userName;


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