From 648eb72de16da108373a2e74b42de25f6c3120a6 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 10 五月 2024 18:04:11 +0800
Subject: [PATCH] Merge branch 'fhx-prod-复购活动' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
index 5724b6a..b5177f2 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
@@ -28,7 +28,7 @@
     /**寮�鍙戜汉闆嗗悎 闈炲繀濉�*/
     private List<OrderDeveloperDto> orderDeveloper;
     /**鏀惰揣鍦板潃*/
-    private DeliveryAddressVo deliveryAddressVo;
+    private DeliveryAddressVo deliveryAddress;
 
     /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
     private Integer cardPass = 0;

--
Gitblit v1.8.0