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 | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
index 7ac2eba..1b1095c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
@@ -21,11 +21,13 @@
IPage<ReportPageDto> pageInsReport(Page page, ReportPageDto reportPageDto);
+// void wordToPdf(String path,String sealUrl);
+
int inReport(String url, Integer id);
- void upReportUrl(Integer id,Integer type);
+ int upReportUrl(Integer id);
// 涓嬭浇
- void downReport(Integer id, Integer type , HttpServletResponse response);
+ void downReport(Integer id, Integer type ,HttpServletResponse response);
//鎻愪氦
int writeReport(Integer id);
--
Gitblit v1.9.3