From 63aab08cd422e940bf27a6908acd0e93a4df3a5c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 六月 2025 08:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/shop/src/main/java/com/doumee/api/business/SolutionsBaseController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/shop/src/main/java/com/doumee/api/business/SolutionsBaseController.java b/server/shop/src/main/java/com/doumee/api/business/SolutionsBaseController.java
index 0d8b61a..c1f73b4 100644
--- a/server/shop/src/main/java/com/doumee/api/business/SolutionsBaseController.java
+++ b/server/shop/src/main/java/com/doumee/api/business/SolutionsBaseController.java
@@ -4,25 +4,25 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.SolutionsBase;
import com.doumee.service.business.SolutionsBaseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
import javax.servlet.http.HttpServletResponse;
+
import java.util.ArrayList;
import java.util.List;
/**
* @author 姹熻箘韫�
- * @date 2024/01/16 10:03
+ * @date 2024/10/28 19:16
*/
-@Api(tags = "淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�")
+@Api(tags = "淇濋櫓鏂规淇℃伅琛�")
@RestController
@RequestMapping("/business/solutionsBase")
public class SolutionsBaseController extends BaseController {
@@ -78,7 +78,7 @@
@PostMapping("/exportExcel")
@RequiresPermissions("business:solutionsbase:exportExcel")
public void exportExcel (@RequestBody PageWrap<SolutionsBase> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(SolutionsBase.class).export(solutionsBaseService.findPage(pageWrap).getRecords(), "淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�", response);
+ ExcelExporter.build(SolutionsBase.class).export(solutionsBaseService.findPage(pageWrap).getRecords(), "淇濋櫓鏂规淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
--
Gitblit v1.9.3