From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 9723a3f..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
@@ -23,12 +23,27 @@
private String activityId;
/** 娲诲姩瑙勫垯鍚嶇О */
private String activityName;
- /** 鏄惁鏁村崟鎶樻墸 */
+ /** 鏄惁鏁村崟鎶樻墸 蹇呭～锛岄粯璁�0*/
private Integer isWholeDiscount;
- /** 鏄惁鍛樺伐鎶樻墸 */
+ /** 鏄惁鍛樺伐鎶樻墸 蹇呭～锛岄粯璁�0*/
private Integer isEmployeeDiscount;
- /** 鏁村崟鎶樻墸/鍛樺伐鎶樻墸(鍗曚綅:鐧惧垎姣�,榛樿:100) */
+ /** 鏁村崟鎶樻墸/鍛樺伐鎶樻墸(鍗曚綅:鐧惧垎姣�,榛樿:100) 蹇呭～锛岄粯璁�100*/
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