Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-10-18 051abca66db233f5dbde3f69aa706422e1ac9fd9

 server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java

@@ -41,4 +41,7 @@
    private Boolean hasBack;
    @ApiModelProperty(value = "结算订单号")
    private String goodsorderId;

    @ApiModelProperty(value = "还车类型 0正常还车 1强制还车")
    private Integer backType;
}