From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java
index 1e67a86..8692e39 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java
@@ -1,16 +1,15 @@
package com.ruoyi.system.api.domain.dto;
import com.ruoyi.common.core.enums.RequestTypeEnum;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.time.LocalDateTime;
@Data
+@ApiModel(value = "售后订单传输对象", description = "售后订单传输对象")
public class OrderReturnDTO {
@ApiModelProperty(value = "数据id")
- private Integer id;
+ private Long id;
@ApiModelProperty(value = "备注")
private String remark;
@@ -19,17 +18,21 @@
private Long orderId;
@ApiModelProperty(value = "售后类型 1=退款 2=退款退货")
- private RequestTypeEnum requestType;
+ private String requestType;
@ApiModelProperty(value = "申请原因")
private String requestReason;
@ApiModelProperty(value = "详情图，不超过五张图片")
- private MultipartFile[] album;
+ private String album;
@ApiModelProperty(value = "快递单号")
private String courierNumber;
+ @ApiModelProperty(value = "快递公司编号")
+ private String Logistics;
+
+
}
--
Gitblit v1.7.1