Merge branch 'dev_cr' into dev

chenrui

2025-03-11 379222715511cc4d6efd4abbbb3463f5485f590d

 cnas-require/src/main/java/com/ruoyi/requier/service/impl/InternalWastesServiceImpl.java

@@ -7,7 +7,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.requier.dto.InternalWastesDto;
import com.ruoyi.requier.mapper.InternalWastesMapper;
import com.ruoyi.requier.pojo.InternalWastes;