Merge branch 'mitao-dev'

mitao

2024-05-31 fc13d832e58e42e241aa827e930651a28ca357e1

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/CouponMemberDTO.java

@@ -1,10 +1,11 @@
package com.ruoyi.promotion.controller.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class CouponMemberDTO {
public class CouponMemberDTO extends BasePage {
    @ApiModelProperty(value = "会员id")
    private  Long memberId;