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

k94314517

2023-10-24 be4bfd2dac75cf4249ef30f85c4fbb07d0dcc67f

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