From 130b710185498fe37c473750d9782a4b009abbbd Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 01 九月 2022 16:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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..b99a9f7 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,8 +3,10 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.util.List;
+
/**
- * Created with IntelliJ IDEA.
+ * 寮�鍗曞弬鏁癉to
*
* @Author: zhouxiang
* @Date: 2022/08/31/10:32
@@ -18,7 +20,10 @@
private String operatorId;
//鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭～
private String shopId;
- private OrdersTotalDto ordersTotal;
- private OrderItemDto orderItem;
- private OrderDeveloperDto orderDeveloper;
+ //鎬昏鍗曚俊鎭紝蹇呭～
+ private OrdersTotalDto orderTotal;
+ //涓�绾у瓙璁㈠崟锛屽繀濉�
+ private List<OrderItemDto> orderItem;
+ //寮�鍙戜汉闆嗗悎
+ private List<OrderDeveloperDto> orderDeveloper;
}
--
Gitblit v1.8.0