Merge branch 'dev' into dev_zj

zss

2025-03-11 eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d

 cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java

@@ -17,7 +17,7 @@
import com.ruoyi.common.utils.DateImageUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.personnel.dto.*;
import com.ruoyi.personnel.excel.PersonTrainingDetailedListener;
import com.ruoyi.personnel.excel.PersonTrainingDetailedUpload;