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

jiaosong

2023-10-17 7ec37d4b36111c0192f2c7674b07f8dd1daf1d53

 server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java

@@ -136,7 +136,7 @@
    private String pricingDetailId;

    @ApiModelProperty(value = "是否节假日 0不是 1是")
    private String isHoliday;
    private Integer isHoliday;


    @ApiModelProperty(value = "还车类型 0正常还车 1强制还车")