Merge remote-tracking branch 'origin/master'

mitao

2024-06-03 a6508a543e3727eb527db5feec9ac7155e88f599

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/mapper/CouponMemberMapper.java

@@ -1,7 +1,7 @@
package com.ruoyi.promotion.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.promotion.domain.CouponMember;
import com.ruoyi.system.api.domain.CouponMember;

/**
 * <p>