分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

 inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java

文件名从 cnas-require/src/main/java/com/ruoyi/require/service/InsReportService.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.require.service;
package com.ruoyi.inspect.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;