From 60f70f7409ec1ece8905e088fb43e0cb0258a70b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 19 十二月 2024 10:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
index 90b81f8..5a355ee 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
@@ -63,7 +63,7 @@
     private BigDecimal paymentAmount;
 
     @ApiModelProperty(value = "配送方式（1=自提，2=快递）")
-    private Integer distributionMode;
+    private String distributionMode;
 
     @ApiModelProperty(value = "门店名称")
     private String shopName;
@@ -84,6 +84,6 @@
     private String technicianName;
 
     @ApiModelProperty(value = "预约单id")
-    private Long technicianSubscribeId;
+    private String technicianSubscribeId;
 
 }

--
Gitblit v1.7.1