From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java
index b412caf..802a33c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java
@@ -93,6 +93,9 @@
     /** 鍗″寘鏍囪瘑 */
     private List<CardItemInfoDto> cardItemInfoIds;
 
+    /** 绗笁鏂筰tem鏍囪瘑 */
+    private String commonItemId;
+
 
 
     /**骞冲彴绫诲瀷-CRM*/

--
Gitblit v1.8.0