修改bug

mitao

2024-09-21 f44e4d609e7efaed9eac545137970b1e334f8106

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java

@@ -1,14 +1,15 @@
package com.ruoyi.system.api.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Data;

@Data
public class MemberOrderListVO {
@@ -77,5 +78,56 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long requestId;

    @ApiModelProperty(value = "快递单号")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String courierNumber;

    @ApiModelProperty("发货快递")
    private String logisticsNum;


    @ApiModelProperty(value = "收货人姓名")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String receiverName;

    @ApiModelProperty(value = "收货人电话")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String receiverPhone;

    @ApiModelProperty(value = "城市")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String receiverCity;


    @ApiModelProperty(value = "详细地址")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String receiverDetailAddress;

    @ApiModelProperty(value = "订单说明")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String orderShuoMin;

    @ApiModelProperty(value = "订单退货周期")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer orderZq;

    @ApiModelProperty(value = "确认收货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private LocalDateTime receiveTime;

    @ApiModelProperty(value = "单位")
    private String unit;

    @ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
    private AuctionOrderTypeEnum auctionOrderType;

    @ApiModelProperty(value = "规格")
    private String spec;

    @ApiModelProperty(value = "规格单位")
    private String specUnit;
    
    @ApiModelProperty("普通商品id")
    private Long goodsId;
}