From 32bf00ebc825716caf9424a137df7c5adf7f39ac Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 31 八月 2022 17:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 fdd9d01..b6315ad 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
@@ -3,6 +3,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.util.List;
+
/**
* Created with IntelliJ IDEA.
*
@@ -18,7 +20,10 @@
private String operatorId;
//鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭～
private String shopId;
+ //鎬昏鍗曚俊鎭紝蹇呭～
private OrdersTotalDto ordersTotal;
- private OrderItemDto orderItem;
+ //涓�绾у瓙璁㈠崟锛屽繀濉�
+ private List<OrderItemDto> orderItem;
+ //寮�鍙戜汉闆嗗悎
private OrderDeveloperDto orderDeveloper;
}
--
Gitblit v1.8.0