From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决

---
 cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
index 9f4ee07..7c598f3 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
@@ -10,7 +10,7 @@
 import com.deepoove.poi.data.Pictures;
 import com.ruoyi.common.utils.DateImageUtil;
 import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
 import com.ruoyi.manage.mapper.ManageRiskAssessmentResultsMapper;
 import com.ruoyi.manage.pojo.ManageRiskAssessmentResults;
 import com.ruoyi.manage.service.ManageRiskAssessmentResultsService;

--
Gitblit v1.9.3