Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-30 9bcc40d213a44498c46dae5e678e592b918b40b0

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

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

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

/**