From 891401eebaa5446bb54f23a46a326a40619e1733 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 07 五月 2024 17:22:48 +0800
Subject: [PATCH] Merge branch 'fhx-prod-0506电子签修改' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java |    3 +++
 1 files changed, 3 insertions(+), 0 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 d6eed8b..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
@@ -1,6 +1,7 @@
 package com.hz.his.dto.order;
 
 import com.hz.his.dto.PageDto;
+import com.hz.his.vo.order.DeliveryAddressVo;
 import lombok.Data;
 
 import java.util.List;
@@ -26,6 +27,8 @@
     private List<OrderItemPHisDto> orderItem;
     /**寮�鍙戜汉闆嗗悎 闈炲繀濉�*/
     private List<OrderDeveloperDto> orderDeveloper;
+    /**鏀惰揣鍦板潃*/
+    private DeliveryAddressVo deliveryAddress;
 
     /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
     private Integer cardPass = 0;

--
Gitblit v1.8.0