From c0c3ba60f8620d2700c76afb62732ef940c38c70 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 06 五月 2023 14:55:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java
index 643be7e..64111b7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java
@@ -15,11 +15,14 @@
 
     /**鐢ㄦ埛浼樻儬鍒哥爜鏍囪瘑闆嗗悎*/
     private List<String> couponNumberIdList;
-
-    /**鍟嗗搧鎬婚噾棰�*/
-    private BigDecimal total;
-    /**鍟嗗搧鎬讳欢鏁�*/
-    private Integer itemNum;
     /**鍟嗗搧淇℃伅*/
     private List<CouponCheckItemDto> goodsList;
+    /**鏀粯鏂瑰紡缂栧彿闆嗗悎*/
+    private List<String> payMethodList;
+
+
+    /**鍟嗗搧鎬婚噾棰�(鏆傛棤鐢�-涓嶄紶)*/
+    private BigDecimal total;
+    /**鍟嗗搧鎬讳欢鏁�(鏆傛棤鐢�-涓嶄紶)*/
+    private Integer itemNum;
 }

--
Gitblit v1.8.0