From 599cb3a300878dc8b3a579f967fbad4a7eb536e7 Mon Sep 17 00:00:00 2001 From: Andru <769883346@qq.com> Date: 星期五, 27 十月 2023 16:07:48 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-test --- phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 7 +++++++ 1 files changed, 7 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..d6eed8b 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 @@ -26,4 +26,11 @@ private List<OrderItemPHisDto> orderItem; /**寮�鍙戜汉闆嗗悎 闈炲繀濉�*/ private List<OrderDeveloperDto> orderDeveloper; + + /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/ + private Integer cardPass = 0; + + /** 璁㈠崟鍗囧崟鍏宠仈鍒楄〃 */ + private List<OrderRiseDto> orderRiseList; + } -- Gitblit v1.8.0