From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/InsReportService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
similarity index 88%
rename from cnas-require/src/main/java/com/ruoyi/require/service/InsReportService.java
rename to inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
index d20a231..1b1095c 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/InsReportService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
@@ -1,4 +1,4 @@
-package com.ruoyi.require.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,10 +13,10 @@
import java.util.Map;
/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恑ns_report(妫�楠屾姤鍛�)銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2024-03-17 22:10:02
-*/
+ * @author Administrator
+ * @description 閽堝琛ㄣ�恑ns_report(妫�楠屾姤鍛�)銆戠殑鏁版嵁搴撴搷浣淪ervice
+ * @createDate 2024-03-17 22:10:02
+ */
public interface InsReportService extends IService<InsReport> {
IPage<ReportPageDto> pageInsReport(Page page, ReportPageDto reportPageDto);
--
Gitblit v1.9.3