From 0846753b50b65e8974b3860e6064c38be9c114a9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 18:40:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev

---
 ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/request/OrderRequest.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/request/OrderRequest.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/request/OrderRequest.java
index 18fce3f..222f6e9 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/request/OrderRequest.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/request/OrderRequest.java
@@ -16,6 +16,12 @@
 @ApiModel(value = "OrderRequest对象", description = "用户下单请求参数对象")
 public class OrderRequest {
 
+    @ApiModelProperty("下单城市")
+    private String city;
+
+    @ApiModelProperty("下单城市code")
+    private String cityCode;
+
     @ApiModelProperty("订单编号")
     private String orderNumber;
 
@@ -31,6 +37,9 @@
     @ApiModelProperty("预约地址(收货地址id)")
     private Integer addressId;
 
+    @ApiModelProperty("手填预约地址")
+    private String fillAddress;
+
     @ApiModelProperty("上门时间")
     private String time;
 

--
Gitblit v1.7.1