From f8cc44e926fd22f9d1d864dc684c827f6960270b Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 26 七月 2024 11:51:30 +0800
Subject: [PATCH] feat: 最新代码及配置

---
 ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/request/OrderRequest.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 b9079c4..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
@@ -5,7 +5,6 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 用户下单请求参数对象
@@ -16,6 +15,12 @@
 @Data
 @ApiModel(value = "OrderRequest对象", description = "用户下单请求参数对象")
 public class OrderRequest {
+
+    @ApiModelProperty("下单城市")
+    private String city;
+
+    @ApiModelProperty("下单城市code")
+    private String cityCode;
 
     @ApiModelProperty("订单编号")
     private String orderNumber;
@@ -32,8 +37,11 @@
     @ApiModelProperty("预约地址(收货地址id)")
     private Integer addressId;
 
+    @ApiModelProperty("手填预约地址")
+    private String fillAddress;
+
     @ApiModelProperty("上门时间")
-    private Date time;
+    private String time;
 
     @ApiModelProperty("预约备注(服务备注)")
     private String reservationRemark;

--
Gitblit v1.7.1