From 039dbb9ab16f295e91cfcdea5bf68bf16bc0417e Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 29 七月 2025 09:22:33 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyCouponDto.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyCouponDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyCouponDto.java index f8a5aed..faa4026 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyCouponDto.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyCouponDto.java @@ -1,6 +1,6 @@ package com.ruoyi.order.domain.dto; -import com.ruoyi.system.api.domain.dto.MgtBaseDto; +import com.ruoyi.system.api.domain.dto.MerBaseDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,10 +12,10 @@ * @Version 1.0 */ @Data -public class MerVerifyCouponDto extends MgtBaseDto { +public class MerVerifyCouponDto extends MerBaseDto { @ApiModelProperty(value = "优惠券id") - private String memberCouponId; + private Long memberCouponId; } -- Gitblit v1.7.1