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

jiangping

2025-02-21 1147614053efae0314a36c15293a6a5ed4e6d737

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

@@ -146,6 +146,14 @@
    @TableField(exist = false)
    private Integer useTimes;

    @ApiModelProperty(value = "使用时长")
    @TableField(exist = false)
    private Integer useTime;

    @ApiModelProperty(value = "剩余时长",hidden = true)
    @TableField(exist = false)
    private Integer surplusTime;

    @ApiModelProperty(value = "骑行记录")
    @TableField(exist = false)
    private List<DiscountLog> discountLogList;