From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java b/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
index cbdee81..949ca95 100644
--- a/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.purchase.dto.ProcurementBusinessSummaryDto;
import com.ruoyi.purchase.service.impl.ProcurementBusinessSummaryServiceImpl;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -31,8 +31,8 @@
private ProcurementBusinessSummaryServiceImpl procurementBusinessSummaryService;
@GetMapping("/listPage")
- public AjaxResult listPage(Page page, ProcurementBusinessSummaryDto procurementBusinessSummaryDto) {
- return AjaxResult.success(procurementBusinessSummaryService.listPage(page, procurementBusinessSummaryDto));
+ public R<?> listPage(Page page, ProcurementBusinessSummaryDto procurementBusinessSummaryDto) {
+ return R.ok(procurementBusinessSummaryService.listPage(page, procurementBusinessSummaryDto));
}
/**
--
Gitblit v1.9.3