From 1b5fc79dd03377f95459878417514c1429336641 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 19 四月 2024 18:33:44 +0800
Subject: [PATCH] Merge branch 'fhx-prod-智能导诊' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 10 ++++++++++
1 files changed, 10 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 bc5dfb3..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,4 +27,13 @@
private List<OrderItemPHisDto> orderItem;
/**寮�鍙戜汉闆嗗悎 闈炲繀濉�*/
private List<OrderDeveloperDto> orderDeveloper;
+ /**鏀惰揣鍦板潃*/
+ private DeliveryAddressVo deliveryAddress;
+
+ /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+ private Integer cardPass = 0;
+
+ /** 璁㈠崟鍗囧崟鍏宠仈鍒楄〃 */
+ private List<OrderRiseDto> orderRiseList;
+
}
--
Gitblit v1.8.0