From a21a8b9b733edd59dbcd3f696d2b69f10c4c3fc9 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:11:24 +0800
Subject: [PATCH] Merge branch 'pxb' into xin

---
 oying-system/src/main/java/com/oying/modules/rider/domain/vo/OrderDeliveryPhotosVo.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/vo/OrderDeliveryPhotosVo.java b/oying-system/src/main/java/com/oying/modules/rider/domain/vo/OrderDeliveryPhotosVo.java
index 845a296..71425f5 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/domain/vo/OrderDeliveryPhotosVo.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/vo/OrderDeliveryPhotosVo.java
@@ -3,6 +3,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.io.Serializable;
 
@@ -25,13 +26,16 @@
     @ApiModelProperty(value = "拍照纬度")
     private String userLatitude;
 
-    @ApiModelProperty(value = "图片地址")
-    private String photoUrl;
-
     @ApiModelProperty(value = "描述")
     private String description;
 
-    @ApiModelProperty(value = "照片存储ID")
+    @ApiModelProperty(value = "图片地址(前端不用传值)")
+    private String photoUrl;
+
+    @ApiModelProperty(value = "桶文件ID(前端不用传值)")
     private Long uploadId;
 
+    @ApiModelProperty(value = "图片文件")
+    private transient MultipartFile photoFile;
+
 }

--
Gitblit v1.9.3