Merge remote-tracking branch 'origin/master'

mitao

2024-06-05 e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberOrderListDTO.java

@@ -2,10 +2,12 @@

import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "用户订单传输对象", description = "用户订单传输对象")
public class MemberOrderListDTO extends BasePage {
    @ApiModelProperty("订单id")
    private Long id;