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

jiaosong

2023-10-25 cc3bbf14c5fde619c23e5502c8583889e94deacc

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

@@ -15,6 +15,9 @@
@ApiModel("骑行记录返回")
public class MemberRidesDTO {

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

    @ApiModelProperty(value = "用户OpenID")
    @ExcelColumn(name="用户",index = 1,width = 10,align = HorizontalAlignment.CENTER)
    private String openid;
@@ -50,4 +53,18 @@
    @ExcelColumn(name="还车时间",index = 9,width = 10,align = HorizontalAlignment.CENTER)
    private Date backDate;

    @ApiModelProperty(value = "租车站点编码")
    private String rentSiteId;

    @ApiModelProperty(value = "租车锁头编码")
    private String rentLockId;


    @ApiModelProperty(value = "还车站点编码")
//    @ExcelColumn(name="归还站点",index = 7,width = 10,align = HorizontalAlignment.CENTER)
    private String backSiteId;

    @ApiModelProperty(value = "还车锁头编码")
//    @ExcelColumn(name="归还锁具",index = 8,width = 10,align = HorizontalAlignment.CENTER)
    private String backLockId;
}