From 0b124f8a24a37f6f665623b2800989619890f83d Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期一, 18 十二月 2023 15:13:15 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
index 53ec72a..ae5268f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
@@ -31,4 +31,19 @@
private BigDecimal discount;
/** 鍒掓墸鐜伴噾鎬婚噾棰�(浣滅敤:鐢ㄦ潵璁＄畻鍒掓墸椤圭洰鐨勬墽琛岄噾棰�,鏀粯鏂瑰紡鏄幇閲戞敮浠樼殑鎬婚噾棰�) */
private BigDecimal snapPayTotal=BigDecimal.ZERO;
+
+ /**鏄惁纭璁㈠崟*/
+ private Integer isCustomerConfirm;
+ /**澶勬柟璁㈠崟鍙�*/
+ private String prescriptionNo;
+ /**澶勬柟璁㈠崟id*/
+ private String prescriptionId;
+
+ /**鍏宠仈鏍囪瘑绫诲瀷:0鑹捐姱鑽熶笓鍖�*/
+ private Integer relationType;
+ /**鍏宠仈鏍囪瘑*/
+ private String relationId;
+ /**鍏宠仈鍚嶇О*/
+ private String relationName;
+
}
--
Gitblit v1.8.0