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

lxp

2025-03-12 11af23e0c7976eed1211ba2ca0beae3a12e19310

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

@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.requier.dto.FeTempHumDateDto;
import com.ruoyi.requier.dto.FeTempHumRecordDto;
import com.ruoyi.requier.mapper.FeTempHumDateMapper;