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

k94314517

2023-10-24 be4bfd2dac75cf4249ef30f85c4fbb07d0dcc67f

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

@@ -128,4 +128,13 @@
    @TableField(exist = false)
    @ExcelColumn(name="退款结算时间",width = 10,align = HorizontalAlignment.CENTER)
    private Date refundDate;

    @ApiModelProperty(value = "最近骑行状态")
    @TableField(exist = false)
    private Integer  memberRidesStatus;


    @ApiModelProperty(value = "是否结算 0 未结算 1已结算")
    @TableField(exist = false)
    private Integer closeStatus;
}