解决冲突

mitao

2024-05-30 885a5836eb0fc1d7fcf54fbdb5f1969b9238a18c

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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.member.domain.pojo.Region;
import com.ruoyi.member.domain.Region;
import com.ruoyi.member.domain.vo.RegionVo;
import java.util.List;