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/OrderItemPHisDto.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
index ae6779a..28f4219 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
@@ -44,6 +44,11 @@
     /**闈炲繀濉� 鏄惁闄愯喘(0:鍚�,1:鏄�),榛樿:1*/
     private String isLimitBug;
 
+    /**杩囨浮鍟嗗搧绫诲瀷蹇呭~淇℃伅*/
+    private OrderTransitionGoodsVo orderTransitionGoods;
+    /**鍟嗗搧绉垎淇℃伅锛岃繖閲屼笉涓虹┖灏变互杩欓噷涓轰富*/
+    private OrderItemIntegralVo orderItemIntegral;
+
     /**闈炲繀濉� 鍗″寘鏍囪瘑 */
     private List<CardItemInfoDto> cardItemInfoIds;
 

--
Gitblit v1.8.0