From a4c539d27c6e7f5268bb0a71df935e3cdfcf3a29 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期一, 06 三月 2023 11:47:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 1630580..52a1938 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
@@ -27,18 +27,18 @@
* 閿�鍞钩鍙扮紪鐮�,渚嬪:娣樺疂,鍦ㄧ數鍟嗗钩鍙拌缃噷闈紝鍦ㄧ涓夋柟骞冲彴閰嶇疆,蹇呭～,crm榛樿濉玞rm
* */
private String sourceCode;
- /**蹇呭～ 璁㈠崟鏉ユ簮鍚嶇О(鍐椾綑) ,crm榛樿濉玞rm*/
+ /**闈炲繀濉� 璁㈠崟鏉ユ簮鍚嶇О(鍐椾綑) ,crm榛樿濉玞rm,(鍚庡彴澶勭悊)*/
private String sourceName;
/**crm蹇呭～ 绗笁鏂硅鍗曞彿,濉玞rm鐨勮鍗曞彿*/
private String sourceOrderNo;
- /** 鍏戞崲鐮�(绗笁鏂瑰厬鎹㈢爜) */
+ /**闈炲繀濉� 鍏戞崲鐮�(绗笁鏂瑰厬鎹㈢爜) */
private String conversionCode;
- /**蹇呭～ 寮�鍙戜汉闂ㄥ簵鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
+ /**蹇呭～ 寮�鍙戜汉闂ㄥ簵鏍囪瘑(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
private String developerShopId;
/**crm蹇呭～ 寮�鍙戜汉鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鏍囪瘑) 涓夊皯璇达細crm灏卞～鐢ㄦ埛*/
private String developerId;
- /**crm蹇呭～ 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) 涓夊皯璇达細crm灏卞～鐢ㄦ埛*/
+ /**闈炲繀濉� 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) 涓夊皯璇达細crm灏卞～鐢ㄦ埛锛屼笉浼�,鍚庡彴澶勭悊*/
private String developerName;
/**蹇呭～ 璁㈠崟鎵�灞炵敤鎴稩d */
@@ -51,18 +51,18 @@
/**crm蹇呭～ 璁㈠崟鎺ㄨ崘浜烘爣璇�,涓夊皯璇达細crm蹇呭～ */
private String inviteeId;
- /**crm蹇呭～ 璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑),涓夊皯璇达細crm蹇呭～ */
+ /**闈炲繀濉� 璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑),涓夊皯璇达細crm蹇呭～ 涓嶄紶,鍚庡彴澶勭悊*/
private String inviteeName;
/**蹇呭～ 鍚屾鐘舵��0鍚�1鏄� ,濡傛灉瑕佸悓姝ュ埌棰嗗缓蹇呭～1锛屽惁鍒�0*/
private int hisSynStatus;
- /**蹇呭～ 璁㈠崟鍏朵粬淇℃伅*/
- private OrderInfoDto orderInfo;
-
- /**鍏呭�艰鍗曞繀濉� 璁㈠崟鎬婚噾棰� */
+ /**蹇呭～ 璁㈠崟鎬婚噾棰�(璁㈠崟绫诲瀷鏄厖鍊艰鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
private BigDecimal total;
+ /**闈炲繀濉� 璁㈠崟鍏朵粬淇℃伅(娌℃湁鍚庡彴榛樿)*/
+ private OrderInfoDto orderInfo;
+
/**闈炲繀濉� 璧犻�侀噾棰� */
private BigDecimal givingAmount;
/**闈炲繀濉� 璧犻�侀噾棰濈被鍨�(GivingAmountType) */
--
Gitblit v1.8.0