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/customervisits/controller/CustomerVisitsController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
index 586ee42..5efdf5a 100644
--- a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
+++ b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
@@ -8,7 +8,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 io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -31,46 +31,46 @@
@GetMapping("/listPage")
@Log(title = "瀹㈡埛鎷滆-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "瀹㈡埛鎷滆-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, CustomerVisits customerVisits) {
+ public R<?> listPage(Page page, CustomerVisits customerVisits) {
IPage<CustomerVisits> listPage = customerVisitsService.listPage(page, customerVisits);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@Log(title = "瀹㈡埛鎷滆-娣诲姞", businessType = BusinessType.INSERT)
@Operation(summary = "瀹㈡埛鎷滆-娣诲姞")
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody CustomerVisits customerVisits) {
+ public R<?> add(@RequestBody CustomerVisits customerVisits) {
boolean save = customerVisitsService.save(customerVisits);
if (save) {
- return AjaxResult.success("娣诲姞鎴愬姛");
+ return R.ok(null, "娣诲姞鎴愬姛");
}
- return AjaxResult.error("娣诲姞澶辫触");
+ return R.fail("娣诲姞澶辫触");
}
@Log(title = "瀹㈡埛鎷滆-缂栬緫", businessType = BusinessType.UPDATE)
@Operation(summary = "瀹㈡埛鎷滆-缂栬緫")
@PostMapping("update")
- public AjaxResult updateCustomerVisit(@RequestBody CustomerVisits customerVisits) {
+ public R<?> updateCustomerVisit(@RequestBody CustomerVisits customerVisits) {
boolean updateResult = customerVisitsService.updateCustomerVisit(customerVisits);
if (updateResult) {
- return AjaxResult.success("缂栬緫鎴愬姛");
+ return R.ok(null, "缂栬緫鎴愬姛");
}
- return AjaxResult.error("缂栬緫澶辫触");
+ return R.fail("缂栬緫澶辫触");
}
@Log(title = "瀹㈡埛鎷滆-鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "瀹㈡埛鎷滆-鍒犻櫎")
@DeleteMapping("{customerId}")
- public AjaxResult deleteCustomerVisit(@PathVariable Integer customerId) {
+ public R<?> deleteCustomerVisit(@PathVariable Integer customerId) {
if (customerId == null) {
- return AjaxResult.error("瀹㈡埛ID涓嶈兘涓虹┖");
+ return R.fail("瀹㈡埛ID涓嶈兘涓虹┖");
}
boolean deleteResult = customerVisitsService.removeById(customerId);
if (deleteResult) {
- return AjaxResult.success("鍒犻櫎鎴愬姛");
+ return R.ok(null, "鍒犻櫎鎴愬姛");
}
- return AjaxResult.error("鍒犻櫎澶辫触");
+ return R.fail("鍒犻櫎澶辫触");
}
}
--
Gitblit v1.9.3