修改冲突

puzhibing

2024-08-17 ffae18d7a8e21b93bc837d889504d2c8b55368c0

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/SysDictDataMapper.java

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

import com.ruoyi.other.model.SysDictData;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.other.api.domain.SysDictData;

/**
 * <p>