From 13f8c7c5a4fedf6b7222f6775d414f6e8bf95ebc Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期五, 30 六月 2023 15:08:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new --- phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java | 5 ++--- 1 files changed, 2 insertions(+), 3 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 03285e2..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 @@ -1,7 +1,6 @@ package com.hz.his.dto.coupon; -import com.hz.his.dto.order.OrderPayMethodDto; import lombok.Data; import java.math.BigDecimal; @@ -18,8 +17,8 @@ private List<String> couponNumberIdList; /**鍟嗗搧淇℃伅*/ private List<CouponCheckItemDto> goodsList; - /**鏀粯鏂瑰紡:payMethodNo鏀粯鏂瑰紡缂栧彿 payMethodName鏀粯鏂瑰紡鍚嶇О*/ - private List<OrderPayMethodDto> payMethodDtoList; + /**鏀粯鏂瑰紡缂栧彿闆嗗悎*/ + private List<String> payMethodList; /**鍟嗗搧鎬婚噾棰�(鏆傛棤鐢�-涓嶄紶)*/ -- Gitblit v1.8.0