From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/request/OrderRequest.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 6a1ba09..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;
/**
* 用户下单请求参数对象
@@ -17,14 +16,17 @@
@ApiModel(value = "OrderRequest对象", description = "用户下单请求参数对象")
public class OrderRequest {
+ @ApiModelProperty("下单城市")
+ private String city;
+
+ @ApiModelProperty("下单城市code")
+ private String cityCode;
+
@ApiModelProperty("订单编号")
private String orderNumber;
@ApiModelProperty("回收服务id")
private Integer serveId;
-
- @ApiModelProperty("下单用户id")
- private Integer userId;
@ApiModelProperty("预约姓名")
private String reservationName;
@@ -32,11 +34,14 @@
@ApiModelProperty("预约手机号")
private String reservationPhone;
- @ApiModelProperty("预约地址")
+ @ApiModelProperty("预约地址(收货地址id)")
private Integer addressId;
+ @ApiModelProperty("手填预约地址")
+ private String fillAddress;
+
@ApiModelProperty("上门时间")
- private Date time;
+ private String time;
@ApiModelProperty("预约备注(服务备注)")
private String reservationRemark;
@@ -47,10 +52,7 @@
@ApiModelProperty("下单用户纬度")
private Double latitude;
- @ApiModelProperty("订单补贴金额")
+ @ApiModelProperty("订单津贴金额")
private BigDecimal subsidy;
-
- @ApiModelProperty("详细地址")
- private String address;
}
--
Gitblit v1.7.1