From 5932ee98f530f93c93c759b8947f95e366e32894 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 05 八月 2023 18:15:42 +0800
Subject: [PATCH] 1、定时任务 商户进件状态查询 2、小程序下单统一支付提交 3、订单核销分账 4、订单退款 5、支付、退款回调 6、分账回调

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerVerifyCouponGetVo.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerVerifyCouponGetVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerVerifyCouponGetVo.java
index 1ec5b71..5ce967a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerVerifyCouponGetVo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerVerifyCouponGetVo.java
@@ -17,14 +17,19 @@
 @Data
 public class MerVerifyCouponGetVo {
 
+    @ApiModelProperty(value = "优惠券id")
+    private String memberCouponId;
 
     @ApiModelProperty(value = "用户id")
     private Long userId;
 
-    @ApiModelProperty(value = "优惠券")
-    private MemberCoupon memberCoupon;
+    @ApiModelProperty(value = "优惠券来源")
+    private String couponFrom;
 
     @ApiModelProperty(value = "商品列表")
     private List<Goods> goodsList;
 
+    @ApiModelProperty(value = "优惠券")
+    private MemberCoupon memberCoupon;
+
 }

--
Gitblit v1.7.1