Merge remote-tracking branch 'origin/dev' into dev

zss

2025-03-13 3b92cf3f9cd038c446e390aab18e759b0463d24a

 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;