Merge branch 'master' into xin

xin

5 days ago 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179

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

@@ -60,6 +60,14 @@
    @ApiModelProperty(value = "钱包状态（0冻结，1正常）")
    private String status;

    @ApiModelProperty(value = "手机号")
    private String phone;

    @ApiModelProperty(value = "骑手姓名")
    private String cardName;

    @ApiModelProperty(value = "骑手身份证号")
    private String cardNum;

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