Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/mapper/SensitiveWordsMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.article.domain.pojo.SensitiveWords;
import com.ruoyi.article.domain.SensitiveWords;

/**
 * <p>