From 6ea2d8166b37cf721b54bfc16dfa844f66e94ad9 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 26 十二月 2023 14:19:28 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/order/DeliveryAddressVo.java | 25 +++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 3 +++
phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java | 4 ++++
3 files changed, 32 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 d6eed8b..b5177f2 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
@@ -1,6 +1,7 @@
package com.hz.his.dto.order;
import com.hz.his.dto.PageDto;
+import com.hz.his.vo.order.DeliveryAddressVo;
import lombok.Data;
import java.util.List;
@@ -26,6 +27,8 @@
private List<OrderItemPHisDto> orderItem;
/**寮�鍙戜汉闆嗗悎 闈炲繀濉�*/
private List<OrderDeveloperDto> orderDeveloper;
+ /**鏀惰揣鍦板潃*/
+ private DeliveryAddressVo deliveryAddress;
/**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
private Integer cardPass = 0;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
index bd3937d..04e5f53 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
@@ -10,6 +10,10 @@
* */
@Data
public class UserReportDto {
+ /**鎿嶄綔浜�*/
+ private String operatorId;
+ private String operatorName;
+
/**杩囨护娴嬭瘯璐﹀彿*/
private Integer isFilterTestAccount;
/**鍛樺伐鏍囪瘑*/
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/DeliveryAddressVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/DeliveryAddressVo.java
new file mode 100644
index 0000000..e76f51e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/DeliveryAddressVo.java
@@ -0,0 +1,25 @@
+package com.hz.his.vo.order;
+
+import lombok.Data;
+
+/**
+ * @author CJH
+ */
+@Data
+public class DeliveryAddressVo {
+
+ /**鏀朵欢-鑱旂郴浜�*/
+ private String linkMan;
+ /**鏀朵欢-鑱旂郴鐢佃瘽*/
+ private String linkTel;
+ /**鏀朵欢-鍦板潃-鐪�*/
+ private String province;
+ /**鏀朵欢-鍦板潃-甯�*/
+ private String city;
+ /**鏀朵欢-鍦板潃-鍖�*/
+ private String area;
+ /**鏀朵欢-鍦板潃-琛楅亾*/
+ private String street;
+ /**鏀朵欢-鍦板潃-璇︾粏*/
+ private String addrDetail;
+}
--
Gitblit v1.8.0