From 6a9d4b49c03781bbb49a41f1d16e510baa2881aa Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 12 七月 2024 14:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx0711-回访优化' 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