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

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

 server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java

@@ -13,6 +13,9 @@
@Data
public class BikeLogDTO {

    @ApiModelProperty(value = "编码")
    private String id;

    @ApiModelProperty(value = "用户OpenID")
    @ExcelColumn(name="用户",index = 1,width = 10,align = HorizontalAlignment.CENTER)
    private String openid;
@@ -34,7 +37,7 @@
    private String rentLockId;

    @ApiModelProperty(value = "骑行时长")
    @ExcelColumn(name="借出时长",index = 8,width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="借出时长(分)",index = 8,width = 10,align = HorizontalAlignment.CENTER)
    private Integer rideTime;
    @ApiModelProperty(value = "计费时长")
//    @ExcelColumn(name="计费时长",index = 8,width = 10,align = HorizontalAlignment.CENTER)
@@ -55,4 +58,12 @@
    @ApiModelProperty(value = "还车时间")
    @ExcelColumn(name="归还时间",index = 14,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date backDate;

    @ApiModelProperty(value = "状态 0请求开锁中 1骑行中 2已还车  3开锁失败")
//    @ExcelColumn(name="状态 ", valueMapping = "0=请求开锁中;1=骑行中;2=已还车;3=开锁失败;" ,width = 10,align = HorizontalAlignment.CENTER)
    private Integer status;

    @ApiModelProperty(value = "结算状态")
//    @ExcelColumn(name="结算状态 ", valueMapping = "0=未结算;1=已结算;" ,width = 10,align = HorizontalAlignment.CENTER)
    private Integer closeStatus;
}