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

jiaosong

2023-10-16 aa6febca297b0e1a68b1877fc9f41885e9fc0c7a

 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强制还车")
@@ -151,4 +151,8 @@
    @ApiModelProperty(value = "强制还车操作人(关联system_user)")
    private String backUserid;

    @ApiModelProperty(value = "骑行时长")
    @TableField(exist = false)
    private Integer rideTime;

}