From 82f1a126d6fb6b5ceda341d8f46f8125f45cfaf7 Mon Sep 17 00:00:00 2001 From: ANDRU-PC\Andru <769883346@qq.com> Date: 星期四, 04 五月 2023 11:50:46 +0800 Subject: [PATCH] Merge branch 'master' into master-test --- phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java | 3 +++ 1 files changed, 3 insertions(+), 0 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 e89eb6f..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 @@ -169,6 +169,9 @@ /** 搴峰崥浣虫爣璇�(KoapOrderTotal) */ private String koapOrderId; + /**璁㈠崟鎬婚噾棰濈殑鎶樺悗閲戦*/ + private BigDecimal disTotal; + private OrderInfoDto orderInfo; private List<String> activityIds; -- Gitblit v1.8.0