From 034add97ea4cb999da850f1c597a76d0b49b920a Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 15 八月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index bb72c99..60a9bc3 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -52,6 +52,8 @@
/**闈炲繀濉� 璁㈠崟娓犻亾鏉ユ簮鍚嶇О(娓犻亾/鐢ㄦ埛) */
private String commonName;
+ /**璁㈠崟鎺ㄨ崘浜虹被鍨�(UserChannelType)鍛樺伐鎴栬�呯敤鎴�,榛樿鐢ㄦ埛*/
+ private String inviteeType;
/**crm蹇呭～ 璁㈠崟鎺ㄨ崘浜烘爣璇�,涓夊皯璇达細crm蹇呭～ */
private String inviteeId;
/**闈炲繀濉� 璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑),涓夊皯璇达細crm蹇呭～ 涓嶄紶,鍚庡彴澶勭悊*/
@@ -63,6 +65,9 @@
/**蹇呭～ 璁㈠崟鎬婚噾棰�(璁㈠崟绫诲瀷鏄厖鍊艰鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
private BigDecimal total;
+ /**闈炲繀濉� 璁㈠崟鎬荤Н鍒�(璁㈠崟绫诲瀷鏄Н鍒嗚鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
+ private BigDecimal totalPoints;
+
/**闈炲繀濉� 璁㈠崟鍏朵粬淇℃伅(娌℃湁鍚庡彴榛樿)*/
private OrderInfoDto orderInfo;
--
Gitblit v1.8.0