From 7e80bb0a3bb2247fb519e00722b76145456981df Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 04 五月 2023 19:01:03 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
index 87a9b9d..518d20f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
@@ -19,7 +19,7 @@
private String id;
/** 璁㈠崟缂栧彿锛屼互S寮�澶�, SyyyyMMdd0000000(鍓嶇紑浠庡瓧鍏歌幏鍙�) */
private String orderNo;
- /** 璁㈠崟绫诲瀷锛圤rderTotalConstants锛�,crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞～retail闆跺敭, 蹇呭～*/
+ /** 璁㈠崟绫诲瀷锛圤rderTotalConstants锛�*/
private String type;
/** 鐘舵��(OrderTotalConstants) */
private Integer status;
@@ -77,13 +77,13 @@
/** 涓嬪崟鎿嶄綔浜哄悕绉� */
private String operatorName;
- /** 寮�鍙戜汉闂ㄥ簵鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) 蹇呭～*/
+ /** 寮�鍙戜汉闂ㄥ簵鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
private String developerShopId;
/** 寮�鍙戜汉闂ㄥ簵鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
private String developerShopName;
- /** 寮�鍙戜汉鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鏍囪瘑) 蹇呭～锛屼笁灏戣锛宑rm灏卞～鐢ㄦ埛*/
+ /** 寮�鍙戜汉鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鏍囪瘑)*/
private String developerId;
- /** 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) 蹇呭～锛屼笁灏戣锛宑rm灏卞～鐢ㄦ埛*/
+ /** 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) */
private String developerName;
@@ -169,6 +169,9 @@
/** 搴峰崥浣虫爣璇�(KoapOrderTotal) */
private String koapOrderId;
+ /**璁㈠崟鎬婚噾棰濈殑鎶樺悗閲戦*/
+ private BigDecimal disTotal;
+
private OrderInfoDto orderInfo;
private List<String> activityIds;
--
Gitblit v1.8.0