Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-28 e1107554c61919ab96c48e3280ce831498f96feb

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

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

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

/**
 * <p>