From 16e8c7adbee6c9ee9bac09a80d44d3bfd3fe2f0c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:38 +0800
Subject: [PATCH] Merge branch '2.0.2' into 2.0.1
---
server/company/src/main/java/com/doumee/api/common/PublicController.java | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/common/PublicController.java b/server/company/src/main/java/com/doumee/api/common/PublicController.java
index 9954481..017b0f3 100644
--- a/server/company/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/company/src/main/java/com/doumee/api/common/PublicController.java
@@ -47,12 +47,6 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
- @ApiOperation("娴嬭瘯")
- @PostMapping("/testPdf")
- public String testPdf(@RequestParam Map<String,String> req, HttpServletResponse response) {
- ExcelToPdfTool.excelToPdf(req.get("f1"),req.get("f2"));
- return JSONObject.toJSONString(req);
- }
@ApiOperation(value = "涓婁紶", notes = "涓婁紶", httpMethod = "POST", position = 6)
@ApiImplicitParams({
@@ -68,8 +62,6 @@
systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode(),
systemDictDataBiz.queryByCode(Constants.OSS,Constants.ENDPOINT).getCode());
}
-
-
@ApiOperation(value = "涓婁紶鍥剧墖", notes = "涓婁紶鍥剧墖", httpMethod = "POST", position = 6)
@ApiImplicitParams({
@ApiImplicitParam(name = "folder", value = "鏂囦欢澶�", required = true, paramType = "query", dataType = "String", dataTypeClass = String.class),
@@ -305,7 +297,6 @@
if (true) {
// 鍏抽棴FTP娴�
// 绉诲姩鎴愬姛,杩斿洖鏂囦欢鍚�
-
/*context.put("error", 0);
context.put("url", remoteFileName);
context.put("fullurl", remoteFileName);
--
Gitblit v1.9.3