Merge remote-tracking branch 'origin/master'

puzhibing

2024-03-18 945561a655919045c3086f00d7d16dbc1d24c23f

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberGiftRecordMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.member.domain.pojo.member.MemberGiftRecord;
import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;

/**
 * <p>