feat: 修复代码冲突

hjl

2024-06-06 c62e9f81b2072473b084abb30f7c005ed341a336

1
2
3
4
5
6
7
8
9
10
11
12
package com.ruoyi.goods.mapper;
 
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.goods.domain.Region;
import org.apache.ibatis.annotations.Param;
 
import java.util.List;
 
public interface RegionMapper extends BaseMapper<Region> {
 
 
}