Merge remote-tracking branch 'origin/master'

xuhy

2024-09-25 ca825fdfe67223b2eb8a3f9c14b4e60e2339efc6

 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>